Handle a few more errors...