Closes #441 display more specific error message
Merge commit '69cff6c472363cb23fc723d9c2b8dbb47257a557' into HEAD