Refactored error Messages