diff --git a/library/src/main/java/com/qualcomm/robotcore/util/ClassUtil.java b/library/src/main/java/com/qualcomm/robotcore/util/ClassUtil.java
index 6c9c69b..54bc281 100644
--- a/library/src/main/java/com/qualcomm/robotcore/util/ClassUtil.java
+++ b/library/src/main/java/com/qualcomm/robotcore/util/ClassUtil.java
@@ -292,7 +292,7 @@ protected static Class findClass(String className)
     protected static class MappedByteBufferInfo
     {
         public static Field blockField = getDeclaredField(java.nio.MappedByteBuffer.class, "block");
-        public static Field addressField = getDeclaredField(blockField.getType(), "address");
+        public static Field addressField = getDeclaredField(blockField != null ? blockField.getType() : Object.class, "address");
     }
 
     public static long memoryAddressFrom(MappedByteBuffer buffer)
diff --git a/to-check-for-modification.md b/to-check-for-modification.md
new file mode 100644
index 0000000..82ac9c2
--- /dev/null
+++ b/to-check-for-modification.md
@@ -0,0 +1,3 @@
+Files modified:
+
+- `src/main/java/com/qualcomm/robotcore/util/ClassUtil.java`
\ No newline at end of file