Refactor with meaningful throw message

Learn from Pair programming