Fix for null name issue