diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs
index c1f64bc3..d9072509 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs
@@ -1107,7 +1107,7 @@ namespace VEPROMS.CSLA.Library
 
 			foreach (MembershipInfo mi in this.UserMemberships)
 			{
-				if (mi.EndDate == string.Empty)
+				if (mi.EndDate == string.Empty && mi.MyGroup.GroupAssignments != null) //B2024-051 added null check - user assigned to non-existing procedure set
 				{
 					foreach (AssignmentInfo ai in mi.MyGroup.GroupAssignments)
 					{
@@ -1129,7 +1129,7 @@ namespace VEPROMS.CSLA.Library
 
 			foreach (MembershipInfo mi in this.UserMemberships)
 			{
-				if (mi.EndDate == string.Empty)
+				if (mi.EndDate == string.Empty && mi.MyGroup.GroupAssignments != null) //B2024-051 added null check - user assigned to non-existing procedure set
 				{
 					Dictionary<int, int> folders = new Dictionary<int, int>();
 					//FolderInfo fi = FolderInfo.Get(dv.MyFolder.FolderID);
@@ -1157,7 +1157,7 @@ namespace VEPROMS.CSLA.Library
 
 			foreach (MembershipInfo mi in this.UserMemberships)
 			{
-				if (mi.EndDate == string.Empty)
+				if (mi.EndDate == string.Empty && mi.MyGroup.GroupAssignments != null) //B2024-051 added null check - user assigned to non-existing procedure set
 				{
 					Dictionary<int, int> folders = new Dictionary<int, int>();
 					FolderInfo fi = FolderInfo.Get(dv.MyFolder.FolderID);
@@ -1184,7 +1184,7 @@ namespace VEPROMS.CSLA.Library
 
 			foreach (MembershipInfo mi in this.UserMemberships)
 			{
-				if (mi.EndDate == string.Empty)
+				if (mi.EndDate == string.Empty && mi.MyGroup.GroupAssignments != null) //B2024-051 added null check - user assigned to non-existing procedure set
 				{
 					Dictionary<int, int> folders = new Dictionary<int, int>();
 					FolderInfo fi = FolderInfo.Get(dv.MyFolder.FolderID);
@@ -1211,7 +1211,7 @@ namespace VEPROMS.CSLA.Library
 
 			foreach (MembershipInfo mi in this.UserMemberships)
 			{
-				if (mi.EndDate == string.Empty)
+				if (mi.EndDate == string.Empty && mi.MyGroup.GroupAssignments != null) //B2024-051 added null check - user assigned to non-existing procedure set
 				{
 					Dictionary<int, int> folders = new Dictionary<int, int>();
 					FolderInfo fi = FolderInfo.Get(dv.MyFolder.FolderID);
@@ -1238,7 +1238,7 @@ namespace VEPROMS.CSLA.Library
 
 			foreach (MembershipInfo mi in this.UserMemberships)
 			{
-				if (mi.EndDate == string.Empty)
+				if (mi.EndDate == string.Empty && mi.MyGroup.GroupAssignments != null) //B2024-051 added null check - user assigned to non-existing procedure set
 				{
 					Dictionary<int, int> folders = new Dictionary<int, int>();
 					FolderInfo fi = FolderInfo.Get(dv.MyFolder.FolderID);