Improved Exception message. Added 2 more test cases.