Merge pull request #121 from sbesson/system_exit

Handle SystemExit in main.py
Fix whitespace in conflict message.
merge master -D org -I include -E exclude: PR 123 (Fix whitespace in conflict message.)