Meh, more error handling modifications