Adjust error message as per @ralphbean advices
Fix the unit-tests as we adjusted the error message

This ought to be the most tested piece of code in the project :)