diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
index 26dc5175..3f93090e 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
@@ -101,9 +101,16 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
             subAccountRoles.ForEach(role =>
             {
-	            var subAccount = role.SubAccounts.First().id;
-	            var workshopIds = _context.WorkshopSubAccounts.Where(x=>x.SubAccountId == subAccount).Select(x=>x.WorkshopId).ToList();
-                role.Edit(role.Title,role.RolePermissions.Select(x=>x.PermissionCode).ToList(),workshopIds);
+                var getSubAccount = role.SubAccounts.FirstOrDefault();
+                if (getSubAccount != null)
+                {
+                    var subAccount = getSubAccount.id;
+
+                    var workshopIds = _context.WorkshopSubAccounts.Where(x => x.SubAccountId == subAccount).Select(x => x.WorkshopId).ToList();
+                    role.Edit(role.Title, role.RolePermissions.Select(x => x.PermissionCode).ToList(), workshopIds);
+                }
+
+          
             });
             await _accountContext.SaveChangesAsync();
         }