simplify logic flow, fix error message
simplify logic flow, fix error message

simong/Hilary,jfederico/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary,stuartf/Hilary,ExC0d3/Hilary,ExC0d3/Hilary,timdegroote/Hilary,Orodan/Hilary,mrvisser/Hilary,simong/Hilary,stuartf/Hilary,nicolaasmatthijs/Hilary,Orodan/Hilary,jfederico/Hilary,mrvisser/Hilary