Fixed bug caused by over-zealous test + added some more error msg