Feat/error handling

Me and Sublime are officially over