diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
index 46c458b..e858fc0 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
@@ -61,10 +61,10 @@
             Thread.currentThread().interrupt();
             throw new ConsistentMapException.Interrupted();
         } catch (ExecutionException e) {
-            throw new ConsistentMapException.Timeout();
-        } catch (TimeoutException e) {
             Throwables.propagateIfPossible(e.getCause());
             throw new ConsistentMapException(e.getCause());
+        } catch (TimeoutException e) {
+            throw new ConsistentMapException.Timeout();
         }
     }