OSNG-12 - added exception handling and exception page
Merge remote-tracking branch 'origin/master'