Changed wording of master
Better error reporting