diff --git a/mmcli/mmcli.py b/mmcli/mmcli.py
index db04de1..46f873b 100755
--- a/mmcli/mmcli.py
+++ b/mmcli/mmcli.py
@@ -128,17 +128,23 @@ def predicate_for_query(query: str):
 
 
 def resolve_team(mm_api: mattermost.MMApi, query: str) -> Optional[Dict]:
-	return first(filter(
-		predicate_for_query(query),
-		mm_api.get_teams()
-	))
+	return first(
+		filter(
+			predicate_for_query(query),
+			mm_api.get_teams()
+		),
+		None
+	)
 
 
 def resolve_channel(mm_api: mattermost.MMApi, team_id: str, query: str) -> Optional[Dict]:
-	return first(filter(
-		predicate_for_query(query),
-		mm_api.get_team_channels(team_id)
-	))
+	return first(
+		filter(
+			predicate_for_query(query),
+			mm_api.get_team_channels(team_id)
+		),
+		None
+	)
 
 
 def resolve_team_channel(mm_api: mattermost.MMApi, query: str) -> Dict:
@@ -156,7 +162,7 @@ def resolve_team_channel(mm_api: mattermost.MMApi, query: str) -> Dict:
 	else:
 		channel = resolve_channel(mm_api, team["id"], query_parts[1])
 	if not channel:
-		return NotFound("channel", query_parts[1])
+		raise NotFound("channel", query_parts[1])
 
 	return team, channel