diff --git a/www/mysql_adapter.php b/www/mysql_adapter.php
index 5d5de2f..b5370e7 100644
--- a/www/mysql_adapter.php
+++ b/www/mysql_adapter.php
@@ -116,6 +116,8 @@ class MySQLAdapter {
 		$post_data = $this->_exec($qry, "s", $post_path)->fetch_assoc();
 		$post_data = $this->_normalize_post_data($post_data);
 
+		$post_data['post_path'] = $post_path;
+
 		if($with_subposts) {
 			$post_data['subposts'] = $this->get_subposts_by_path($post_path);
 		}
diff --git a/www/post_adapter.php b/www/post_adapter.php
index ff082ec..c35aea0 100644
--- a/www/post_adapter.php
+++ b/www/post_adapter.php
@@ -16,6 +16,10 @@ class PostHandler extends MySQLAdapter {
     function _normalize_post_data($post_data) {
         $post_data = parent::_normalize_post_data($post_data);
 
+		if(!$post_data['found']) {
+			return $post_data;
+		}
+
 		$post_data["post_basename"] = basename($post_data["post_path"]);
 
         $post_meta = $post_data['post_metadata'];