diff --git a/api/mockserver_test.go b/api/mockserver_test.go
index df8ccfa7875f222e4436eea8e2f13350d1dd98cc..5b823f9730e7fea954db989a53804f5064264b0a 100644
--- a/api/mockserver_test.go
+++ b/api/mockserver_test.go
@@ -500,7 +500,7 @@ func getNDF() *ndf.NetworkDefinition {
 
 func startServers() {
 	//func StartRegistrationServer(id, localServer string, handler Handler, certPEMblock, keyPEMblock []byte) *Comms {
-	RegComms = registration.StartRegistrationServer( "testServer", def.Registration.Address, &RegHandler, nil, nil)
+	RegComms = registration.StartRegistrationServer("testServer", def.Registration.Address, &RegHandler, nil, nil)
 	def.Gateways = make([]ndf.Gateway, 0)
 
 	//Start up gateways
diff --git a/api/ndf_test.go b/api/ndf_test.go
index a9ec49175a8a3e47716e9ccbf0e260192542a852..7ee0a866a1b44eb308aff5ebbcfdf9bec10c98da 100644
--- a/api/ndf_test.go
+++ b/api/ndf_test.go
@@ -56,7 +56,6 @@ var ExampleJSON = `{"Timestamp": "2019-06-04T20:48:48-07:00", "gateways": [{"Add
 //	}
 //}
 
-
 // Tests that VerifyNDF() panics when given the incorrect RSA public key.
 func TestVerifyNDF_ErrPublicKey(t *testing.T) {
 	// Generate RSA private key and fake RSA public key
diff --git a/io/updateNdf.go b/io/updateNdf.go
index 427260b7f0cb925ce5e7d9856669262e557dd945..2e4304f1d6bb72b5d811898a4e8afe9862b7692f 100644
--- a/io/updateNdf.go
+++ b/io/updateNdf.go
@@ -40,7 +40,7 @@ func PollNdf(currentDef *ndf.NetworkDefinition, comms *client.Comms) (*ndf.Netwo
 	}
 
 	//If there was no error and the response is nil, client's ndf is up-to-date
-	if response == nil {
+	if response == nil || response.Ndf == nil {
 		globals.Log.DEBUG.Printf("Client NDF up-to-date")
 		return nil, nil
 	}