diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java
index 6c24901..f1ad1ec 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java
@@ -53,10 +53,13 @@
                 createParams.getSrc_tp_port(), createParams.getDst_tp_port(),
                 createParams.getPriority(), createParams.getTunnel_id());
 
+        IPv4Net src_ip = (createParams.getSrc_ip() != null) ?
+                new IPv4Net(createParams.getSrc_ip()) : null;
+        IPv4Net dst_ip = (createParams.getDst_ip() != null) ?
+                new IPv4Net(createParams.getDst_ip()) : null;
         boolean result = segmentRoutingService.createPolicy(
                 createParams.getPolicy_id(), null, null, null,
-                new IPv4Net(createParams.getSrc_ip()),
-                new IPv4Net(createParams.getDst_ip()),
+                src_ip, dst_ip,
                 getProtoTypeByte(createParams.getProto_type()),
                 createParams.getSrc_tp_port(),
                 createParams.getDst_tp_port(),
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterResource.java b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterResource.java
index 621a6cd..0dc9b78 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterResource.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterResource.java
@@ -47,7 +47,7 @@
         try {
             if (routerId == null && statsType == null){
                 return eval(toRepresentation(mutableTopology.getSwitches(), null));
-        }
+            }
             else if(routerId != null && statsType.equals("port")){
                 Switch sw = mutableTopology
                 .getSwitch(new Dpid(HexString.toLong(routerId)));
