Added some more fail handling