added missing exit(0) command on error
Merge remote-tracking branch 'upstream/master'