Clear up error messages (#734)