diff --git a/src/objects/zcl_abapgit_object_form.clas.abap b/src/objects/zcl_abapgit_object_form.clas.abap
index 00969a40f..df92bd2be 100644
--- a/src/objects/zcl_abapgit_object_form.clas.abap
+++ b/src/objects/zcl_abapgit_object_form.clas.abap
@@ -423,7 +423,7 @@ CLASS ZCL_ABAPGIT_OBJECT_FORM IMPLEMENTATION.
         _clear_changed_fields( CHANGING cs_form_data = ls_form_data ).
 
         compress_lines( is_form_data = ls_form_data
-                         it_lines     = lt_lines ).
+                        it_lines     = lt_lines ).
 
         INSERT ls_form_data INTO TABLE lt_form_data.
 
@@ -488,6 +488,10 @@ CLASS ZCL_ABAPGIT_OBJECT_FORM IMPLEMENTATION.
 
     _sort_tdlines_by_windows( CHANGING ct_form_windows  = es_form_data-windows
                                        ct_lines         = et_lines ).
+
+    es_form_data-form_header-tdversion = '00001'.
+    es_form_data-text_header-tdversion = '00001'.
+
   ENDMETHOD.
 
 
@@ -534,6 +538,9 @@ CLASS ZCL_ABAPGIT_OBJECT_FORM IMPLEMENTATION.
       lv_firstloop = abap_true.
       READ TABLE lt_lines INTO ls_lines WITH KEY tdformat = lv_elt_windows
                                                  tdline   = ls_form_windows-tdwindow.
+      IF sy-subrc <> 0.
+        CONTINUE. " current loop
+      ENDIF.
       LOOP AT lt_lines INTO ls_lines FROM sy-tabix.
         IF lv_firstloop = abap_false AND
            ls_lines-tdformat = lv_elt_windows.