diff --git a/src/main/java/org/aludratest/service/gui/web/selenium/selenium2/Selenium2Wrapper.java b/src/main/java/org/aludratest/service/gui/web/selenium/selenium2/Selenium2Wrapper.java
index 76929fee..6b0a4dd0 100644
--- a/src/main/java/org/aludratest/service/gui/web/selenium/selenium2/Selenium2Wrapper.java
+++ b/src/main/java/org/aludratest/service/gui/web/selenium/selenium2/Selenium2Wrapper.java
@@ -1136,13 +1136,14 @@ private void handleSeleniumException(Throwable e) {
                 throw new AutomationException("Element not found", wde);
             }
 
+            // check for a time out
+            if (wde instanceof TimeoutException) {
+                throw new PerformanceFailure(wde.getMessage(), wde);
+            }
+
             throw wde;
         }
 
-        // check for a time out
-        if (e instanceof TimeoutException) {
-            throw new PerformanceFailure(e.getMessage(), e);
-        }
 
         // otherwise, throw a technical exception
         throw new TechnicalException("Unknown exception when clicking element", e);