diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c663cc62..370788220 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 4.0.1 - 2024-Apr-23
+
+### Fixed
+
+- graph
+  - Fixed issue with SPFx behavior null check #3012
+
 ## 4.0.0 - 2024-Apr-22
 
 ### Added
diff --git a/package.json b/package.json
index 1d96dba2e..7968fe98f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "@pnp/monorepo",
     "private": true,
     "type": "module",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "A JavaScript library for SharePoint & Graph development.",
     "devDependencies": {
         "@azure/identity": "4.1.0",
diff --git a/packages/graph/behaviors/spfx.ts b/packages/graph/behaviors/spfx.ts
index 5c96698d7..1e31be129 100644
--- a/packages/graph/behaviors/spfx.ts
+++ b/packages/graph/behaviors/spfx.ts
@@ -26,7 +26,7 @@ class SPFxTokenNullOrUndefinedError extends Error {
 
 export function SPFxToken(context: ISPFXContext): TimelinePipe<Queryable> {
 
-    SPFxTokenNullOrUndefinedError.check("SPFxToken");
+    SPFxTokenNullOrUndefinedError.check("SPFxToken", context);
 
     return (instance: Queryable) => {
 
@@ -47,7 +47,7 @@ export function SPFxToken(context: ISPFXContext): TimelinePipe<Queryable> {
 
 export function SPFx(context: ISPFXContext): TimelinePipe<Queryable> {
 
-    SPFxTokenNullOrUndefinedError.check("SPFx");
+    SPFxTokenNullOrUndefinedError.check("SPFx", context);
 
     return (instance: Queryable) => {