diff --git a/rpc/legacyrpc/rpcserver_test.go b/rpc/legacyrpc/rpcserver_test.go
index bb4e0b1..b41ee1a 100644
--- a/rpc/legacyrpc/rpcserver_test.go
+++ b/rpc/legacyrpc/rpcserver_test.go
@@ -26,7 +26,8 @@ func TestThrottle(t *testing.T) {
 		go func() {
 			res, err := http.Get(srv.URL)
 			if err != nil {
-				t.Fatal(err)
+				t.Log(err)
+				return
 			}
 			codes <- res.StatusCode
 		}()
diff --git a/rpc/walletrpc/api.pb.go b/rpc/walletrpc/api.pb.go
index a0232bb..e6716e4 100644
--- a/rpc/walletrpc/api.pb.go
+++ b/rpc/walletrpc/api.pb.go
@@ -1210,10 +1210,12 @@ type SpentnessNotificationsResponse struct {
 	Spender         *SpentnessNotificationsResponse_Spender `protobuf:"bytes,3,opt,name=spender" json:"spender,omitempty"`
 }
 
-func (m *SpentnessNotificationsResponse) Reset()                    { *m = SpentnessNotificationsResponse{} }
-func (m *SpentnessNotificationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SpentnessNotificationsResponse) ProtoMessage()               {}
-func (*SpentnessNotificationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
+func (m *SpentnessNotificationsResponse) Reset()         { *m = SpentnessNotificationsResponse{} }
+func (m *SpentnessNotificationsResponse) String() string { return proto.CompactTextString(m) }
+func (*SpentnessNotificationsResponse) ProtoMessage()    {}
+func (*SpentnessNotificationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{36}
+}
 
 func (m *SpentnessNotificationsResponse) GetTransactionHash() []byte {
 	if m != nil {
diff --git a/waddrmgr/manager.go b/waddrmgr/manager.go
index 4dd4cae..45ee067 100644
--- a/waddrmgr/manager.go
+++ b/waddrmgr/manager.go
@@ -1783,10 +1783,10 @@ func Create(ns walletdb.ReadWriteBucket,
 
 	pubParams := masterKeyPub.Marshal()
 
-	var privParams []byte = nil
+	var privParams []byte
 	var masterKeyPriv *snacl.SecretKey
-	var cryptoKeyPrivEnc []byte = nil
-	var cryptoKeyScriptEnc []byte = nil
+	var cryptoKeyPrivEnc []byte
+	var cryptoKeyScriptEnc []byte
 	if !isWatchingOnly {
 		masterKeyPriv, err = newSecretKey(&privPassphrase, config)
 		if err != nil {