Added code hardening against FIRE-4459. Not sure if this really fixes a crash until we find a repro method.
Added code hardening against FIRE-4459. Not sure if this really fixes a crash until we find a repro method.

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