Another attempt to fix Kinesis detection - this time to fix the null case