Fix for crash issue when expected data was missing on occasion