diff --git a/container/tomcat/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java b/container/tomcat/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
index 91daee5cd..39fd427ce 100644
--- a/container/tomcat/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
+++ b/container/tomcat/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
@@ -159,6 +159,8 @@ public void removeRequestListener(ServletRequestListener listener) {
 
     @Override
     public int getActiveSessionCount() {
+        if (this.context.getManager() == null)
+            return 0;
         return this.context.getManager().getActiveSessions();
     }
 
@@ -194,6 +196,7 @@ private Object[] addListener(Object listener, Object[] listeners) {
 
     private Object[] removeListener(Object listener, Object[] listeners) {
         if (listeners == null) return null;
+        if (listeners.length == 0) return null;
 
         List<Object> listenerList = new ArrayList<>(listeners.length - 1);