Added a couple of null checks and allow for optional eventType on meters