Correct existing tests for future try / except work.
Allow returning inside a try / except. Closes #163
Merge branch 'master' into bugfix/paultag/fix-try-except
Try/Except: Ensure that we return properly

 From both inside a try and in an exception handler.