Improved error message on unit conversion failure
Merge pull request #1011 from dkillick/conv_unit_fail_msg

Improved error message on unit conversion failure