Added handlers for more errors