Handle extra error cases