Error handler
Merge pull request #1006 from brooksryba/develop

Develop