MAINT-3553 Another checking is added to avoid possible crash.
MAINT-3553 Another checking is added to avoid possible crash.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm