1 files changed, 2 insertions, 3 deletions
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index fc11e3e80d..010f201b78 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -76,10 +76,9 @@ void _CORE_message_queue_Seize(
   executing = _Thread_Executing;
   executing->Wait.return_code = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
   _ISR_Disable( level );
-  if ( the_message_queue->number_of_pending_messages != 0 ) {
+  the_message = _CORE_message_queue_Get_pending_message( the_message_queue );
+  if ( the_message != NULL ) {
     the_message_queue->number_of_pending_messages -= 1;
-
-    the_message = _CORE_message_queue_Get_pending_message( the_message_queue );
     _ISR_Enable( level );
 
     *size = the_message->Contents.size;