Adds failsafe for null names