More updates to error handling conditionals