proper error handling proposal
missing semicolons
Merge branch 'error_handling_fix' into develop