diff --git a/server/src/com/cloud/event/ActionEventCallback.java b/server/src/com/cloud/event/ActionEventCallback.java index eeec2b4feae..0ab3c63c1a6 100644 --- a/server/src/com/cloud/event/ActionEventCallback.java +++ b/server/src/com/cloud/event/ActionEventCallback.java @@ -181,7 +181,9 @@ public class ActionEventCallback implements MethodInterceptor, AnnotationInterce Adapters eventBusImpls = locator.getAdapters(EventBus.class); if (eventBusImpls != null) { Enumeration eventBusenum = eventBusImpls.enumeration(); - _eventBus = eventBusenum.nextElement(); + if (eventBusenum != null && eventBusenum.hasMoreElements()) { + _eventBus = eventBusenum.nextElement(); + } } _eventBusLoaded = true; }