Catch more critical errors