getByFullName and getBySystem code replaced with safer methods