Fixed possible null value