Fixed possible exception