* Return more descriptive error when adding duplicate devices on sysName * clean up functions to make more clear and reduce duplication * moved return to correct place