Proper checks for error message functions
Add -D to more utilities