From 83abff890d0584fee2f53d4e03849719a7cc1544 Mon Sep 17 00:00:00 2001
From: G S Prakash Naidu
 <146939767+GSPrakashNaidu2662@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:26:48 +0530
Subject: [PATCH] [RCF-991] (#449)

---
 .../clientmanager/service/RegistrationServiceImpl.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/clientmanager/src/main/java/io/mosip/registration/clientmanager/service/RegistrationServiceImpl.java b/android/clientmanager/src/main/java/io/mosip/registration/clientmanager/service/RegistrationServiceImpl.java
index 0bc15845..0b43254e 100644
--- a/android/clientmanager/src/main/java/io/mosip/registration/clientmanager/service/RegistrationServiceImpl.java
+++ b/android/clientmanager/src/main/java/io/mosip/registration/clientmanager/service/RegistrationServiceImpl.java
@@ -188,9 +188,11 @@ public void submitRegistrationDto(String makerName) throws Exception {
             throw new ClientCheckedException(context, R.string.err_004);
         }
 
-        if(this.registrationDto.getFlowType().equals("NEW")) {
-            List<String> selectedHandles = this.globalParamRepository.getSelectedHandles();
-            this.registrationDto.getDemographics().put("selectedHandles", selectedHandles);
+        List<String> selectedHandles = this.globalParamRepository.getSelectedHandles();
+        if(selectedHandles != null) {
+            if (this.registrationDto.getFlowType().equals("NEW")) {
+                this.registrationDto.getDemographics().put("selectedHandles", selectedHandles);
+            }
         }
 
 //        try {