Clean up error messaging and handling