summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index e772aec6cc..a1a917130f 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1400,7 +1400,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
final ClientConnector connector = getConnector(app,
invocation.getConnectorId());
- if (connector.isConnectorEnabled()) {
+ if (connector != null && connector.isConnectorEnabled()) {
enabledConnectors.add(connector);
}
}