more error message cleanup