Fix a bug in an error message and do a little cleaning & tightening up
Fix a bug in an error message and do a little cleaning & tightening up

yob/roxml,rusikf/representable,irfanah/representable,boutil/roxml,Empact/roxml,jarib/roxml,jajuki13/representable,apotonick/representable,Casecommons/representable,Empact/roxml,boutil/roxml,tastyworks/representable,parndt/representable,simonoff/representable,tastyworks/representable