1 files changed, 4 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index 1e58fb30c0..92c235167c 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -348,13 +348,16 @@ public abstract class AbstractClientConnector implements ClientConnector,
         @Override
         public Iterator<ClientConnector> iterator() {
             CombinedIterator<ClientConnector> iterator = new CombinedIterator<ClientConnector>();
-            iterator.addIterator(connector.getExtensions().iterator());
 
             if (connector instanceof HasComponents) {
                 HasComponents hasComponents = (HasComponents) connector;
                 iterator.addIterator(hasComponents.iterator());
             }
 
+            Collection<Extension> extensions = connector.getExtensions();
+            if (extensions.size() > 0) {
+                iterator.addIterator(extensions.iterator());
+            }
             return iterator;
         }
     }