diff --git a/include/ostatus.php b/include/ostatus.php
index 74ad948869..992c77f378 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -980,6 +980,7 @@ class ostatus {
 		$r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
 
 		if (!dbm::is_result($r)) {
+			/// @TODO don't quit silently
 			killme();
 		}
 
diff --git a/mod/settings.php b/mod/settings.php
index bfc444334f..c5b7988803 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -385,6 +385,7 @@ function settings_post(App $a) {
 		//  changing it to the new value
 		$r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
 		if (!dbm::is_result($r)) {
+			/// @todo Don't quit silently here
 			killme();
 		} elseif ( $oldpass != $r[0]['password'] ) {
 			notice( t('Wrong password.') . EOL);