Add exception
Merge pull request #3 from ackintosh/develop

Add exception