Catch unavoidable errors
Fixed stupid mistakes