Added simple exception handler.
Merge branch 'feature-exception-handler'
merged