diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 53953c139..5f4a60e62 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -7,6 +7,8 @@
  - fixed #9892: Typo in "Default Gallery View Album" Template [TEMPLATE]
  - fixed #9826: Inbox messages sent by email don't include from username
  - rfe: added Asset History browser (perlDreamer Consulting, LLC and Plain Black)
+ - fixed: Commit w/ approval workflow can crash under race conditions
+   resulting in permanently locked content (Martin Kamerbeek / Oqapi )
 
 7.6.14
  - fixed: IE6 shows Admin Bar over Asset Manager
diff --git a/lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm b/lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm
index 37003e049..e9bf08047 100644
--- a/lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm
+++ b/lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm
@@ -344,7 +344,7 @@ sub setMessageCompleted {
     for my $messageId ( split /,/, $instance->getScratch("messageId") ) { 
         if($messageId){
             my $message = $inbox->getMessage( $messageId );
-            $message->setCompleted;
+            $message->setCompleted if $message;
         }
     }