From def8da9f424a9669bb55082868723dccc4f194ad Mon Sep 17 00:00:00 2001
From: Jana Radhakrishnan <mrjana@docker.com>
Date: Fri, 17 Jun 2016 09:17:03 -0700
Subject: [PATCH] Check if DriverState is valid before using in convert

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
---
 components/engine/daemon/cluster/convert/network.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/engine/daemon/cluster/convert/network.go b/components/engine/daemon/cluster/convert/network.go
index 53b952427a..6bb9a8185c 100644
--- a/components/engine/daemon/cluster/convert/network.go
+++ b/components/engine/daemon/cluster/convert/network.go
@@ -148,17 +148,22 @@ func BasicNetworkFromGRPC(n swarmapi.Network) basictypes.NetworkResource {
 		}
 	}
 
-	return basictypes.NetworkResource{
+	nr := basictypes.NetworkResource{
 		ID:         n.ID,
 		Name:       n.Spec.Annotations.Name,
 		Scope:      "swarm",
-		Driver:     n.DriverState.Name,
 		EnableIPv6: spec.Ipv6Enabled,
 		IPAM:       ipam,
 		Internal:   spec.Internal,
-		Options:    n.DriverState.Options,
 		Labels:     n.Spec.Annotations.Labels,
 	}
+
+	if n.DriverState != nil {
+		nr.Driver = n.DriverState.Name
+		nr.Options = n.DriverState.Options
+	}
+
+	return nr
 }
 
 // BasicNetworkCreateToGRPC converts a NetworkCreateRequest to a grpc NetworkSpec.