Initial commit
Improving exception message.