diff --git a/src/bgp/ermvpn/ermvpn_route.cc b/src/bgp/ermvpn/ermvpn_route.cc
index b6ffde2cc8c..62459ce9ce3 100644
--- a/src/bgp/ermvpn/ermvpn_route.cc
+++ b/src/bgp/ermvpn/ermvpn_route.cc
@@ -277,15 +277,12 @@ bool ErmVpnRoute::IsValid() const {
     const BgpAttr *attr = BestPath()->GetAttr();
     switch (prefix_.type()) {
     case ErmVpnPrefix::NativeRoute:
-        return attr->label_block();
-        break;
+        return attr->label_block().get() != NULL;
     case ErmVpnPrefix::LocalTreeRoute:
-        return attr->edge_discovery();
-        break;
+        return attr->edge_discovery() != NULL;
     case ErmVpnPrefix::GlobalTreeRoute:
-        return attr->edge_forwarding();
-        break;
-    default:
+        return attr->edge_forwarding() != NULL;
+    case ErmVpnPrefix::Invalid:
         break;
     }