Fix for possible exception