diff --git a/src/utils/zcl_abapgit_url.clas.abap b/src/utils/zcl_abapgit_url.clas.abap
index d03765d2f..801d9f4b5 100644
--- a/src/utils/zcl_abapgit_url.clas.abap
+++ b/src/utils/zcl_abapgit_url.clas.abap
@@ -47,7 +47,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_URL IMPLEMENTATION.
+CLASS zcl_abapgit_url IMPLEMENTATION.
 
 
   METHOD host.
@@ -68,10 +68,11 @@ CLASS ZCL_ABAPGIT_URL IMPLEMENTATION.
 
     IF rv_name IS INITIAL.
       FIND REGEX '([\w-]+)/$' IN lv_path SUBMATCHES rv_name.
+      IF sy-subrc <> 0.
+        zcx_abapgit_exception=>raise( 'Malformed URL' ).
+      ENDIF.
     ENDIF.
 
-    ASSERT NOT rv_name IS INITIAL.
-
   ENDMETHOD.
 
 
@@ -98,7 +99,7 @@ CLASS ZCL_ABAPGIT_URL IMPLEMENTATION.
 
   METHOD validate.
 
-    regex( iv_url ).
+    name( iv_url ).
 
   ENDMETHOD.
 ENDCLASS.