diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog
index 6cffea629d..f6903001e7 100644
--- a/cpukit/rtems/ChangeLog
+++ b/cpukit/rtems/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-14	Joel Sherrill <joel@OARcorp.com>
+
+	PR 651/core
+	* src/taskident.c: Add NULL check for id.
+
 2004-06-29	Joel Sherrill <joel@OARcorp.com>
 
 	PR 631/rtems
diff --git a/cpukit/rtems/src/taskident.c b/cpukit/rtems/src/taskident.c
index 7567112a94..12614fe206 100644
--- a/cpukit/rtems/src/taskident.c
+++ b/cpukit/rtems/src/taskident.c
@@ -54,6 +54,9 @@ rtems_status_code rtems_task_ident(
 {
   Objects_Name_to_id_errors  status;
 
+  if ( !id )
+    return RTEMS_INVALID_ADDRESS;
+
   if ( name == OBJECTS_ID_OF_SELF ) {
     *id = _Thread_Executing->Object.id;
     return RTEMS_SUCCESSFUL;