2 files changed, 9 insertions, 11 deletions
diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c
index 3a185ce125..71f62fe482 100644
--- a/cpukit/score/src/objectgetisr.c
+++ b/cpukit/score/src/objectgetisr.c
@@ -43,10 +43,12 @@ Objects_Control *_Objects_Get_isr_disable(
     return NULL;
   }
 
-#if defined(RTEMS_MULTIPROCESSING)
-  *location = _Objects_MP_Is_remote( information, id );
-#else
   *location = OBJECTS_ERROR;
+
+#if defined(RTEMS_MULTIPROCESSING)
+  if ( _Objects_MP_Is_remote( id, information ) ) {
+    *location = OBJECTS_REMOTE;
+  }
 #endif
 
   return NULL;
diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c
index 0df9190beb..0628544f70 100644
--- a/cpukit/score/src/objectmp.c
+++ b/cpukit/score/src/objectmp.c
@@ -351,9 +351,9 @@ Objects_Name_or_id_lookup_errors _Objects_MP_Global_name_search(
   return status;
 }
 
-Objects_Locations _Objects_MP_Is_remote(
-  Objects_Information *information,
-  Objects_Id           the_id
+bool _Objects_MP_Is_remote(
+  Objects_Id                 the_id,
+  const Objects_Information *information
 )
 {
   Objects_MP_Control *the_global_object;
@@ -371,11 +371,7 @@ Objects_Locations _Objects_MP_Is_remote(
 
   _Objects_MP_Global_release( &lock_context );
 
-  if ( the_global_object != NULL ) {
-    return OBJECTS_REMOTE;
-  } else {
-    return OBJECTS_ERROR;
-  }
+  return the_global_object != NULL;
 }
 
 Objects_MP_Control *_Objects_MP_Allocate_global_object( void )