Catch some more failure cases