improved error detection again, stop committing, go to bed