diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
index 3797af95..f451487c 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
@@ -295,7 +295,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
                 HasUploadedImage = rollCallEmployee?.HasUploadedImage == "true"
             };
 
-            if (res.HasUploadedImage)
+            if (res.HasUploadedImage && res.EmployeeSettings != null)
             {
                 return Partial("ModalTakeImagesEdit", res);
             }
@@ -467,7 +467,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
                     var employeeSettings =
                         _customizeWorkshopSettingsApplication.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(
                             _workshopId, hasRollCallEmployee.EmployeeId);
-                    if (employeeSettings.Id == 0)
+                    if (employeeSettings == null || employeeSettings.Id == 0)
                     {
                         return new JsonResult(new
                         {
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
index 70dfdd9e..ebbaa029 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
@@ -13,7 +13,8 @@ var rollCallStatusIdTemp;
 $(document).ready(function () {
 
     $("#next-step").on("click", function () {
-        if ($("#step-form2").is(":visible") && !hasUploadedImage) {
+        debugger;
+        if ($("#step-form2").is(":visible")/* && !hasUploadedImage*/) {
 
             if ($("#workshopSettingSelect").val() === "0") {
                 $('.alert-msg').show();
@@ -387,7 +388,7 @@ async function set() {
     let pic2 = $("#pic2").attr('src');
     const img1 = document.getElementById('pic1');
     const img2 = document.getElementById('pic2');
-
+    debugger;
     let workshopId = Number($('#workshopId').val());
     let employeeId = Number($('#employeeId').val());