diff --git a/src/zabapgit_http.prog.abap b/src/zabapgit_http.prog.abap
index ba2f36952..58ad090ff 100644
--- a/src/zabapgit_http.prog.abap
+++ b/src/zabapgit_http.prog.abap
@@ -307,7 +307,7 @@ CLASS lcl_http_digest IMPLEMENTATION.
         internal_error = 3
         OTHERS         = 4.
     IF sy-subrc <> 0.
-      BREAK-POINT.
+
     ENDIF.
 
     rv_hash = lv_hash.
diff --git a/src/zabapgit_object_tabl.prog.abap b/src/zabapgit_object_tabl.prog.abap
index 3b1380db0..7b7784249 100644
--- a/src/zabapgit_object_tabl.prog.abap
+++ b/src/zabapgit_object_tabl.prog.abap
@@ -379,31 +379,31 @@ CLASS lcl_object_tabl IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-     DATA: lo_table_validation       TYPE REF TO lcl_object_tabl_validation,
-           lo_local_version_output TYPE REF TO lcl_xml_output,
-           lo_local_version_input  TYPE REF TO lcl_xml_input,
-           lv_validation_text        TYPE string.
+    DATA: lo_table_validation     TYPE REF TO lcl_object_tabl_validation,
+          lo_local_version_output TYPE REF TO lcl_xml_output,
+          lo_local_version_input  TYPE REF TO lcl_xml_input,
+          lv_validation_text      TYPE string.
 
-     CREATE OBJECT lo_local_version_output.
-     me->lif_object~serialize( lo_local_version_output ).
+    CREATE OBJECT lo_local_version_output.
+    me->lif_object~serialize( lo_local_version_output ).
 
-     CREATE OBJECT lo_local_version_input
-       EXPORTING
-         iv_xml = lo_local_version_output->render( ).
+    CREATE OBJECT lo_local_version_input
+      EXPORTING
+        iv_xml = lo_local_version_output->render( ).
 
-     CREATE OBJECT lo_table_validation.
+    CREATE OBJECT lo_table_validation.
 
-     lv_validation_text = lo_table_validation->validate(
-       io_remote_version = io_remote_version_xml
-       io_local_version  = lo_local_version_input ).
-     IF lv_validation_text IS NOT INITIAL.
-       lv_validation_text = |Database Table { ms_item-obj_name }: { lv_validation_text }|.
-       CREATE OBJECT ro_comparison_result TYPE lcl_tabl_validation_dialog
-         EXPORTING
-           iv_message = lv_validation_text.
-     ELSE.
-       CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
-     ENDIF.
+    lv_validation_text = lo_table_validation->validate(
+      io_remote_version = io_remote_version_xml
+      io_local_version  = lo_local_version_input ).
+    IF lv_validation_text IS NOT INITIAL.
+      lv_validation_text = |Database Table { ms_item-obj_name }: { lv_validation_text }|.
+      CREATE OBJECT ro_comparison_result TYPE lcl_tabl_validation_dialog
+        EXPORTING
+          iv_message = lv_validation_text.
+    ELSE.
+      CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    ENDIF.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_TABL IMPLEMENTATION
\ No newline at end of file
diff --git a/src/zabapgit_objects_impl.prog.abap b/src/zabapgit_objects_impl.prog.abap
index 0a1635957..482930ea4 100644
--- a/src/zabapgit_objects_impl.prog.abap
+++ b/src/zabapgit_objects_impl.prog.abap
@@ -655,25 +655,24 @@ CLASS lcl_objects IMPLEMENTATION.
                               iv_language = io_repo->get_master_language( )
                               is_metadata = lo_xml->get_metadata( ) ).
 
-    break copat.
       READ TABLE lt_remote WITH KEY filename = <ls_result>-filename INTO ls_remote_file.
       IF ls_remote_file-filename NS '.abap'.
 
-      "if file does not exist in remote, we don't need to validate
-      IF sy-subrc = 0.
-        CREATE OBJECT lo_current_version
-          EXPORTING
-            iv_xml = lcl_convert=>xstring_to_string_utf8( ls_remote_file-data ).
-        lo_comparison_result = li_obj->compare_to_remote_version( lo_current_version ).
-        lo_comparison_result->show_confirmation_dialog( ).
-
-        IF lo_comparison_result->is_result_complete_halt( ) = abap_true.
-          RAISE EXCEPTION TYPE lcx_exception
+        "if file does not exist in remote, we don't need to validate
+        IF sy-subrc = 0.
+          CREATE OBJECT lo_current_version
             EXPORTING
-              iv_text = 'Deserialization aborted by user'.
+              iv_xml = lcl_convert=>xstring_to_string_utf8( ls_remote_file-data ).
+          lo_comparison_result = li_obj->compare_to_remote_version( lo_current_version ).
+          lo_comparison_result->show_confirmation_dialog( ).
+
+          IF lo_comparison_result->is_result_complete_halt( ) = abap_true.
+            RAISE EXCEPTION TYPE lcx_exception
+              EXPORTING
+                iv_text = 'Deserialization aborted by user'.
+          ENDIF.
         ENDIF.
       ENDIF.
-      endif.
 
       li_obj->mo_files = lo_files.