Fixes more error handling errors