diff --git a/server/src/com/cloud/event/UsageEventUtils.java b/server/src/com/cloud/event/UsageEventUtils.java index 2e422297093..6cb0f63d2b5 100644 --- a/server/src/com/cloud/event/UsageEventUtils.java +++ b/server/src/com/cloud/event/UsageEventUtils.java @@ -139,12 +139,17 @@ public class UsageEventUtils { if (account == null) return; + // if an invalid zone is passed in, create event without zone UUID + String zoneUuid = null; + if (dc != null) + zoneUuid = dc.getUuid(); + Event event = new Event(ManagementServer.Name, EventCategory.USAGE_EVENT.getName(), usageEventType, resourceType, resourceUUID); Map eventDescription = new HashMap(); eventDescription.put("account", account.getUuid()); - eventDescription.put("zone", dc.getUuid()); + eventDescription.put("zone", zoneUuid); eventDescription.put("event", usageEventType); eventDescription.put("resource", resourceType); eventDescription.put("id", resourceUUID);