MAINT-3539 Additional checking was added to avoid possible crash.
MAINT-3539 Additional checking was added to avoid possible crash.

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