diff --git a/src/objects/zcl_abapgit_object_ddlx.clas.abap b/src/objects/zcl_abapgit_object_ddlx.clas.abap
index 2280d54fe..0f5339595 100644
--- a/src/objects/zcl_abapgit_object_ddlx.clas.abap
+++ b/src/objects/zcl_abapgit_object_ddlx.clas.abap
@@ -33,9 +33,9 @@ CLASS zcl_abapgit_object_ddlx IMPLEMENTATION.
     ASSIGN COMPONENT iv_fieldname
            OF STRUCTURE cg_metadata
            TO <lg_field>.
-    ASSERT sy-subrc = 0.
-
-    CLEAR: <lg_field>.
+    IF sy-subrc = 0.
+      CLEAR: <lg_field>.
+    ENDIF.
 
   ENDMETHOD.
 
@@ -79,6 +79,11 @@ CLASS zcl_abapgit_object_ddlx IMPLEMENTATION.
     clear_field( EXPORTING iv_fieldname = 'MASTER_SYSTEM'
                  CHANGING  cg_metadata  = <lg_metadata> ).
 
+    clear_field( EXPORTING iv_fieldname = 'ABAP_LANGUAGE_VERSION'
+                 CHANGING  cg_metadata  = <lg_metadata> ).
+    clear_field( EXPORTING iv_fieldname = 'ABAP_LANGU_VERSION'
+                 CHANGING  cg_metadata  = <lg_metadata> ).
+
   ENDMETHOD.