Catch more failing cases gracefully