diff -ur ibmswtpm2-1637.orig/src/NVDynamic.c ibmswtpm2-1637/src/NVDynamic.c
--- ibmswtpm2-1637.orig/src/NVDynamic.c	2020-03-26 23:15:48.000000000 +0100
+++ ibmswtpm2-1637/src/NVDynamic.c	2020-08-20 16:37:09.481920068 +0200
@@ -122,7 +122,7 @@
 	    if(HandleGetType(nvHandle) == type)
 		break;
 	}
-    if(handle != NULL)
+    if(addr && (handle != NULL))
 	*handle = nvHandle;
     return addr;
 }
Only in ibmswtpm2-1637/src: NVDynamic.c~