Small changes for empty values and added meter creation parameter.

There are just a couple small changes for null checks.   Additionally, the 'eventType' can be (optionally) passed in to the meter creation function.