diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp index 270a2ddffa..762f38e7a1 100644 --- a/src/kits/tracker/Tracker.cpp +++ b/src/kits/tracker/Tracker.cpp @@ -581,9 +581,10 @@ TTracker::MessageReceived(BMessage* message) case kStopWatchClipboardRefs: { BMessenger messenger; - message->FindMessenger("target", &messenger); - if (messenger.IsValid()) + if (message->FindMessenger("target", &messenger) == B_OK + && messenger.IsValid()) { fClipboardRefsWatcher->RemoveFromNotifyList(messenger); + } break; }