[20170712160322] General Improvements

Increased Error Handling

Thanks to @alrs for the improved error handling. This will help track down errors overall and fix them thanks to the increased visibility.

See PR #2247 for more info.