change exception
Merge pull request #4184 from qunox/changeexception

change exception