diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap
index 1fd9a67cd..4527311ae 100644
--- a/src/objects/zcl_abapgit_objects_program.clas.abap
+++ b/src/objects/zcl_abapgit_objects_program.clas.abap
@@ -584,7 +584,8 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION.
 
 * loop dynpros and skip generated selection screens
     LOOP AT lt_d020s ASSIGNING <ls_d020s>
-        WHERE type <> 'S' AND type <> 'W' AND type <> 'J'.
+        WHERE type <> 'S' AND type <> 'W' AND type <> 'J'
+        AND NOT dnum IS INITIAL.
 
       CALL FUNCTION 'RPY_DYNPRO_READ'
         EXPORTING
@@ -602,7 +603,7 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION.
           permission_error     = 3
           OTHERS               = 4.
       IF sy-subrc <> 0.
-        zcx_abapgit_exception=>raise( 'Error while reading dynpro' ).
+        zcx_abapgit_exception=>raise( |Error while reading dynpro: { sy-subrc }| ).
       ENDIF.
 
       LOOP AT lt_fields_to_containers ASSIGNING <ls_field>.