1 files changed, 8 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index 24a0438476..1f09c14fb0 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -103,11 +103,15 @@ public abstract class AbstractComponentConnector extends AbstractConnector
     @Override
     public Widget getWidget() {
         if (widget == null) {
-            Profiler.enter("AbstractComponentConnector.createWidget for "
-                    + getClass().getSimpleName());
+            if (Profiler.isEnabled()) {
+                Profiler.enter("AbstractComponentConnector.createWidget for "
+                        + getClass().getSimpleName());
+            }
             widget = createWidget();
-            Profiler.leave("AbstractComponentConnector.createWidget for "
-                    + getClass().getSimpleName());
+            if (Profiler.isEnabled()) {
+                Profiler.leave("AbstractComponentConnector.createWidget for "
+                        + getClass().getSimpleName());
+            }
         }
 
         return widget;