Possible exception fixed