1 files changed, 4 insertions, 4 deletions
diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c
index b1212ac9c7..3a185ce125 100644
--- a/cpukit/score/src/objectgetisr.c
+++ b/cpukit/score/src/objectgetisr.c
@@ -42,12 +42,12 @@ Objects_Control *_Objects_Get_isr_disable(
     *location = OBJECTS_ERROR;
     return NULL;
   }
-  *location = OBJECTS_ERROR;
 
 #if defined(RTEMS_MULTIPROCESSING)
-  _Objects_MP_Is_remote( information, id, location, &the_object );
-  return the_object;
+  *location = _Objects_MP_Is_remote( information, id );
 #else
-  return NULL;
+  *location = OBJECTS_ERROR;
 #endif
+
+  return NULL;
 }