diff --git a/source/blender/editors/transform/transform_convert_nla.cc b/source/blender/editors/transform/transform_convert_nla.cc
index 3a35e84cebf..7751c7c6aee 100644
--- a/source/blender/editors/transform/transform_convert_nla.cc
+++ b/source/blender/editors/transform/transform_convert_nla.cc
@@ -621,13 +621,15 @@ static void createTransNlaData(bContext *C, TransInfo *t)
         if (tdn->handle == 2) {
           tdn += 2;
         }
-        else {
+        else if (tdn->handle) {
           tdn++;
         }
       }
     }
   }
 
+  BLI_assert(tdn <= (((TransDataNla *)tc->custom.type.data) + tc->data_len));
+
   /* cleanup temp list */
   ANIM_animdata_freelist(&anim_data);
 }