diff --git a/mod/item.php b/mod/item.php
index 2080bb1653..695e76a2fa 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -139,7 +139,7 @@ function item_post(App &$a) {
 
 			// If the contact id doesn't fit with the contact, then set the contact to null
 			$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
-			if (count($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
+			if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
 				AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
 				$parent_contact = null;
 
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 43e9cf715e..f9e9400fc2 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -102,6 +102,8 @@ function lostpass_content(App &$a) {
 			dbesc($new_password_encoded),
 			intval($uid)
 		);
+
+		/// @TODO Is dbm::is_result() okay here?
 		if ($r) {
 			$tpl = get_markup_template('pwdreset.tpl');
 			$o .= replace_macros($tpl,array(