diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp
index 61841fe2d3..51b944941e 100644
--- a/src/kits/app/Application.cpp
+++ b/src/kits/app/Application.cpp
@@ -972,9 +972,9 @@ BApplication::DispatchMessage(BMessage *message, BHandler *handler)
 
 		case B_APP_ACTIVATED:
 		{
-			bool active = false;
-			message->FindBool("active", &active);
-			AppActivated(active);
+			bool active;
+			if (message->FindBool("active", &active) == B_OK)
+				AppActivated(active);
 			break;
 		}
 
diff --git a/src/kits/app/Clipboard.cpp b/src/kits/app/Clipboard.cpp
index ac264e534e..17e8109b6c 100644
--- a/src/kits/app/Clipboard.cpp
+++ b/src/kits/app/Clipboard.cpp
@@ -131,8 +131,8 @@ BClipboard::StopWatching(BMessenger target)
 		&& message.AddMessenger("target", target) == B_OK
 		&& fClipHandler.SendMessage(&message, &reply) == B_OK) {
 		int32 result;
-		reply.FindInt32("result", &result);
-		return result;
+		if (reply.FindInt32("result", &result) == B_OK)
+			return result;
 	}
 	return B_ERROR;
 }