Get rid of crud and fix error message.