diff --git a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/FlowRuleJuniperImpl.java b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/FlowRuleJuniperImpl.java
index d4c09dc..cb07843 100644
--- a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/FlowRuleJuniperImpl.java
+++ b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/FlowRuleJuniperImpl.java
@@ -100,7 +100,7 @@
         try {
             reply = session.get(routingTableBuilder());
         } catch (NetconfException e) {
-            throw new RuntimeException(new NetconfException("Failed to retrieve configuration.",
+            throw new IllegalStateException(new NetconfException("Failed to retrieve configuration.",
                     e));
         }
         Collection<StaticRoute> devicesStaticRoutes =
@@ -241,7 +241,7 @@
                 }
             }
         } catch (NetconfException e) {
-            throw new RuntimeException(new NetconfException("Failed to retrieve configuration.",
+            throw new IllegalStateException(new NetconfException("Failed to retrieve configuration.",
                     e));
         }
         return false;
@@ -335,7 +335,7 @@
         try {
             replay = session.get(commitBuilder());
         } catch (NetconfException e) {
-            throw new RuntimeException(new NetconfException("Failed to retrieve configuration.",
+            throw new IllegalStateException(new NetconfException("Failed to retrieve configuration.",
                     e));
         }
 
@@ -355,7 +355,7 @@
         try {
             replay = session.get(rollbackBuilder(0));
         } catch (NetconfException e) {
-            throw new RuntimeException(new NetconfException("Failed to retrieve configuration.",
+            throw new IllegalStateException(new NetconfException("Failed to retrieve configuration.",
                     e));
         }
 
