Adding more info to error message.
Merge branch 'master' into release