Merge pull request #118 from saredd/master

1 files changed, 8 insertions, 5 deletions

diff --git a/avstream/avscamera/sys/WorkItem.cpp b/avstream/avscamera/sys/WorkItem.cpp
index 9bb0d795..64f6238b 100644
--- a/avstream/avscamera/sys/WorkItem.cpp
+++ b/avstream/avscamera/sys/WorkItem.cpp
@@ -157,11 +157,14 @@ Return Value:
     KWorkItem *Me = (KWorkItem *) Context;
 
     //  Invoke the callback if one exists.
-    if( Me->m_Callback )
+    if (Me)
     {
-        Me->m_Callback( IoObject, Me->m_Context );
-    }
+        if (Me->m_Callback)
+        {
+            Me->m_Callback(IoObject, Me->m_Context);
+        }
 
-    //  Unlock the work item; allow for destruction or re-enqueing.
-    Me->Release();
+        //  Unlock the work item; allow for destruction or re-enqueing.
+        Me->Release();
+    }
 }