Another fix for an possible null value