Handle some more errors