Fixed: more consistent exception handling
Merge branch 'development'