diff --git a/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs b/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs index 43c0c58b..73287312 100644 --- a/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs +++ b/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs @@ -129,7 +129,7 @@ public string HandleTransactionEvent(OCPPMessage msgIn, OCPPMessage msgOut) transaction.Uid = transactionEventRequest.TransactionInfo.TransactionId; transaction.ChargePointId = ChargePointStatus?.Id; transaction.ConnectorId = connectorId; - transaction.StartTagId = ct.TagId; + transaction.StartTagId = ct?.TagId; transaction.StartTime = transactionEventRequest.Timestamp.UtcDateTime; transaction.MeterStart = meterKWH; transaction.StartResult = transactionEventRequest.TriggerReason.ToString(); @@ -328,7 +328,7 @@ private void GetMeterValues(ICollection meterValues, out double meterTime = null; stateOfCharge = -1; - foreach (MeterValueType meterValue in meterValues) + foreach (MeterValueType meterValue in meterValues ?? []) { foreach (SampledValueType sampleValue in meterValue.SampledValue) {