From 81ae4adc72ae2624ca9a4cd62030ed02a42cfc4f Mon Sep 17 00:00:00 2001 From: Sam Yu Date: Mon, 2 Mar 2026 14:51:12 +0000 Subject: [PATCH 1/2] Added checks to fix nullpointerexception --- .../InputSystem/InputManagerStateMonitors.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs b/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs index d5e0b6432c..2c355428e0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs @@ -397,7 +397,7 @@ internal unsafe void FireStateChangeNotifications(int deviceIndex, double intern catch (Exception exception) { Debug.LogError( - $"Exception '{exception.GetType().Name}' thrown from state change monitor '{listener.monitor.GetType().Name}' on '{listener.control}'"); + $"Exception '{exception.GetType().Name}' thrown from state change monitor '{(listener.monitor?.GetType().Name ?? "null")}' on '{(listener.control?.ToString() ?? "null")}'"); Debug.LogException(exception); } From bc7d61aa14d0f70fa7cd5073fabc950a3045020b Mon Sep 17 00:00:00 2001 From: Sam Yu Date: Wed, 4 Mar 2026 11:34:04 +0000 Subject: [PATCH 2/2] Updated changelog --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index b0d94475a1..a988f70030 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed +- Fixed a `NullPointerReferenceException` thrown in `InputManagerStateMonitors.FireStateChangeNotifications` logging by adding validation [UUM-136095]. - Improved New Input System warning dialog, Native Device Inputs Not Enabled [UUM-132151]. - Fixed caching for InputControlPath display name [ISX-2501](https://jira.unity3d.com/browse/ISX-2501)