[TIMOB-13335] Fixed exceptions not exiting the callstack properly
Merge pull request #148 from bryan-m-hughes/timob-13335

[TIMOB-13335] Fixed exceptions not exiting the callstack properly