Removes crappy error handling