diff --git a/controllers/MediaController.inc b/controllers/MediaController.inc
index 69c3607a..79bb3146 100644
--- a/controllers/MediaController.inc
+++ b/controllers/MediaController.inc
@@ -425,7 +425,7 @@
 			// Set filename
 			$media['filename'] = ROOT.DS.\nre\configs\AppConfig::$dirs['seminarymedia'].DS.$media['id'];
 			if(!file_exists($media['filename'])) {
-				throw new \nre\exceptions\IdNotFoundException($media['url']);
+				throw new \nre\exceptions\IdNotFoundException($media['id'].': '.$media['url']);
 			}
 			
 			// Cache
diff --git a/models/MediaModel.inc b/models/MediaModel.inc
index 673ec773..826641c7 100644
--- a/models/MediaModel.inc
+++ b/models/MediaModel.inc
@@ -97,12 +97,13 @@
 			$data = $this->db->query(
 				'SELECT id, name, url, description, mimetype '.
 				'FROM seminarymedia '.
-				'WHERE url = ?',
-				's',
+				'WHERE seminary_id = ? AND url = ?',
+				'is',
+                $seminaryId,
 				$seminaryMediaUrl
 			);
 			if(empty($data)) {
-				throw new \nre\exceptions\IdNotFoundException($seminaryMediaUrl);
+				throw new \nre\exceptions\IdNotFoundException($seminaryId.': '.$seminaryMediaUrl);
 			}