Handling some more errors