Added a fix for a potential crash.
Added a fix for a potential crash.