exit(1) instead of exit() terminating the script after handling an exception
Merge remote-tracking branch 'maug/master'