Added some exception handling
Merge branch 'master' into database
Merge remote-tracking branch 'origin/master'