diff --git a/api/client.go b/api/client.go
index 0c775b99e927c4e3efaef26fb0289e9c284600e7..685e7dca25ac36403b4171826e3f6b91e1332854 100644
--- a/api/client.go
+++ b/api/client.go
@@ -752,7 +752,7 @@ func (c *Client) GetNodeRegistrationStatus() (int, int, error) {
 			"registrations when network is not healthy")
 	}
 
-	nodes := c.network.GetInstance().GetFullNdf().Get().Nodes
+	nodes := c.network.GetInstance().GetPartialNdf().Get().Nodes
 
 	var numRegistered int
 	var numStale = 0
diff --git a/backup/backup.go b/backup/backup.go
index b36b297df3b5a094d23609abc56e3b77b7b330d6..f4f1c19ee2191e2b00deb2e269f42bed04cb5bef 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -197,6 +197,11 @@ func (b *Backup) TriggerBackup(reason string) {
 	b.mux.RLock()
 	defer b.mux.RUnlock()
 
+	if b == nil || b.kv == nil {
+		jww.ERROR.Printf("TriggerBackup called on unitialized object")
+		return
+	}
+
 	key, salt, params, err := loadBackup(b.kv)
 	if err != nil {
 		jww.ERROR.Printf("Backup Failed: could not load key, salt, and "+