improve errors?!?!?