Fixed null exception error