Fixes yet more error handling errors