fix/handle some more errors