diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap
index 5d438fcf2..80805c5f4 100644
--- a/src/git/zcl_abapgit_git_pack.clas.abap
+++ b/src/git/zcl_abapgit_git_pack.clas.abap
@@ -238,7 +238,8 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION.
             gzip_out       = lv_compressed
             gzip_out_len   = lv_compressed_len ).
 
-        IF lv_compressed(lv_compressed_len) <> lv_data(lv_compressed_len).
+        IF xstrlen( lv_data ) <= lv_compressed_len OR
+          lv_compressed(lv_compressed_len) <> lv_data(lv_compressed_len).
           "Lets try with zlib before error in out for good
           "This fixes issues with TFS 2017 and visualstudio.com Git repos
           zlib_decompress( CHANGING cv_data = lv_data