Changed use of deprecated exception syntax
Merge branch 'syntax-fixes' into develop