diff --git a/src/solaris/native/java/io/FileDescriptor_md.c b/src/solaris/native/java/io/FileDescriptor_md.c
index 7147a14c5440d6412cca0afb29453f40718b9000..ba353cba2f23ba383d45139a51d89eb954427b8f 100644
--- a/src/solaris/native/java/io/FileDescriptor_md.c
+++ b/src/solaris/native/java/io/FileDescriptor_md.c
@@ -23,9 +23,11 @@
  * questions.
  */
 
+#include "jni.h"
+#include "jni_util.h"
 #include "jvm.h"
-#include "io_util_md.h"
 
+#include "io_util_md.h"
 #include "java_io_FileDescriptor.h"
 
 /*******************************************************************/
@@ -41,7 +43,7 @@ jfieldID IO_fd_fdID;
 
 JNIEXPORT void JNICALL
 Java_java_io_FileDescriptor_initIDs(JNIEnv *env, jclass fdClass) {
-    IO_fd_fdID = (*env)->GetFieldID(env, fdClass, "fd", "I");
+    CHECK_NULL(IO_fd_fdID = (*env)->GetFieldID(env, fdClass, "fd", "I"));
 }
 
 /**************************************************************