Fix incorrect msg action being sent + add a null check to Location before teleport