diff --git a/actions/logout.php b/actions/logout.php
index b2f0628f21..053130b9f7 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -26,7 +26,7 @@ class LogoutAction extends Action {
 			common_user_error(_t('Not logged in.'));
 		} else {
 			common_set_user(NULL);
-			common_redirect(common_local_url('main'));
+			common_redirect(common_local_url('public'));
 		}
 	}
 }
diff --git a/actions/showstream.php b/actions/showstream.php
index 45e155feab..c9b35ee0bb 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -35,12 +35,14 @@ class ShowstreamAction extends StreamAction {
 
 		if (!$user) {
 			$this->no_such_user();
+			return;
 		}
 
 		$profile = $user->getProfile();
 
 		if (!$profile) {
 			common_server_error(_t('User record exists without profile.'));
+			return;			
 		}
 
 		# Looks like we're good; show the header