diff --git a/mod/parse_url.php b/mod/parse_url.php
index f4fb2d06a..7631a5a71 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -33,7 +33,8 @@ function parse_url_content(App $a)
 		$url = trim($_GET['url']);
 	// fallback in case no url is valid
 	} else {
-		$a->internalRedirect();
+		Logger::info('No url given');
+		exit();
 	}
 
 	if (!empty($_GET['title'])) {
diff --git a/mod/photos.php b/mod/photos.php
index 07693742c..5dcb21a9d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -189,7 +189,7 @@ function photos_post(App $a)
 
 	if ($a->argc > 3 && $a->argv[2] === 'album') {
 		if (!Strings::isHex($a->argv[3])) {
-			$a->internalRedirect();
+			$a->internalRedirect('photos/' . $a->data['user']['nickname'] . '/album');
 		}
 		$album = hex2bin($a->argv[3]);
 
@@ -1032,7 +1032,7 @@ function photos_content(App $a)
 	if ($datatype === 'album') {
 		// if $datum is not a valid hex, redirect to the default page
 		if (!Strings::isHex($datum)) {
-			$a->internalRedirect();
+			$a->internalRedirect('photos/' . $a->data['user']['nickname']. '/album');
 		}
 		$album = hex2bin($datum);