Better handling for fatal errors

Some types of fatal errors were being missed