changed error handling yet again