Fixed possible null reference exception