128b747
Removed the system exits (cherry picked from commit 541821663c95362b763cb55f5444ae51cbb50432)