1 files changed, 9 insertions, 3 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
index 4bb1343a..6faa35fd 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
@@ -228,9 +228,15 @@ public class AdresssucheController {
         }
 
         int extractInt(String s) {
-          final String num = s.replaceAll("\\D", "");
-          // return 0 if no digits found
-          return num.isEmpty() ? 0 : Integer.parseInt(num);
+          if (StringUtils.isNotEmpty(s)) {
+            final String num = s.replaceAll("\\D", "");
+            // return 0 if no digits found
+            return num.isEmpty() ? 0 : Integer.parseInt(num);
+          
+          } else {
+            return 0;
+            
+          }
         }
       };
     }