Clean up error messages, move defaults warning to an error