proper error handling proposal
missing semicolons
fix merge conflicts
Merge branch 'debris-error_handling_fix' into develop