Index: ActiviteitenOpvolging/ProductiePitching/mappers/CacheMapper.vb
===================================================================
diff -u -r1764 -r1784
--- ActiviteitenOpvolging/ProductiePitching/mappers/CacheMapper.vb	(.../CacheMapper.vb)	(revision 1764)
+++ ActiviteitenOpvolging/ProductiePitching/mappers/CacheMapper.vb	(.../CacheMapper.vb)	(revision 1784)
@@ -166,7 +166,11 @@
                 Dim employeeInitials = ExtractItemFromDataReader(dr, $"Gebruiker_{i}", String.Empty)
                 Dim employee As IEmployee = If(employeeInitials.Equals(String.Empty), Nothing, employees.FirstOrDefault(Function(employeeToCheck) employeeToCheck.Initials.Equals(employeeInitials)))
                 'Set the current state based on the enum value. If the quantity is 0, the status is automatically zero.
-                .State = ConvertEnumValueToActivityState(If(.QuantityToProduce = 0, ActivityStateEnum.Zero, ActivityStateEnumMapper.GetActivityStateFromLetter(ExtractItemFromDataReader(Of Char)(dr, $"Status_{i}"))), activity, employee)
+                Dim stateValue = ActivityStateEnum.Zero
+                If (.QuantityToProduce > 0) And (employee IsNot Nothing) Then
+                    stateValue = ActivityStateEnumMapper.GetActivityStateFromLetter(ExtractItemFromDataReader(Of Char)(dr, $"Status_{i}"))
+                End If
+                .State = ConvertEnumValueToActivityState(stateValue, activity, employee)
             End With
             'Add to collection of activities.
             activities.Add(activity)