MAINT-616 Fix for crash on teleport from previous changes
MAINT-616 Fix for crash on teleport from previous changes

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