diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md
index d183c9808..ac6f6c05c 100644
--- a/docs/release-notes/release-notes-0.16.0.md
+++ b/docs/release-notes/release-notes-0.16.0.md
@@ -182,6 +182,9 @@ certain large transactions](https://github.com/lightningnetwork/lnd/pull/7100).
 * [Updated several tlv stream-decoding callsites to use tlv/v1.1.0 P2P variants
   for untrusted input.](https://github.com/lightningnetwork/lnd/pull/7227)
 
+* [Prevent nil pointer dereference during funding manager 
+  test](https://github.com/lightningnetwork/lnd/pull/7268)
+
 ## `lncli`
 
 * [Add an `insecure` flag to skip tls auth as well as a `metadata` string slice
diff --git a/funding/manager.go b/funding/manager.go
index b33b18ced..649785cb7 100644
--- a/funding/manager.go
+++ b/funding/manager.go
@@ -4439,10 +4439,7 @@ func (f *Manager) getInitialFwdingPolicy(permChanID lnwire.ChannelID) (
 	chanID := make([]byte, 32)
 	copy(chanID, permChanID[:])
 
-	value, err := f.cfg.Wallet.Cfg.Database.GetInitialFwdingPolicy(
-		chanID,
-	)
-
+	value, err := f.cfg.Wallet.Cfg.Database.GetInitialFwdingPolicy(chanID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/funding/manager_test.go b/funding/manager_test.go
index c50901f13..af04d33d0 100644
--- a/funding/manager_test.go
+++ b/funding/manager_test.go
@@ -3082,15 +3082,17 @@ func TestFundingManagerCustomChannelParameters(t *testing.T) {
 
 	// After the funding is sigend and before the channel announcement
 	// we expect Alice and Bob to store their respective fees in the database.
-	forwardingPolicy, _ := alice.fundingMgr.getInitialFwdingPolicy(fundingSigned.ChanID)
-	if err := assertFees(forwardingPolicy, 42, 1337); err != nil {
-		t.Fatal(err)
-	}
+	forwardingPolicy, err := alice.fundingMgr.getInitialFwdingPolicy(
+		fundingSigned.ChanID,
+	)
+	require.NoError(t, err)
+	require.NoError(t, assertFees(forwardingPolicy, 42, 1337))
 
-	forwardingPolicy, _ = bob.fundingMgr.getInitialFwdingPolicy(fundingSigned.ChanID)
-	if err := assertFees(forwardingPolicy, 100, 1000); err != nil {
-		t.Fatal(err)
-	}
+	forwardingPolicy, err = bob.fundingMgr.getInitialFwdingPolicy(
+		fundingSigned.ChanID,
+	)
+	require.NoError(t, err)
+	require.NoError(t, assertFees(forwardingPolicy, 100, 1000))
 
 	// Wait for Alice to published the funding tx to the network.
 	var fundingTx *wire.MsgTx