MOE-05: Better error reporting