UP: Added a better error message