diff --git a/lib/model/comment.php b/lib/model/comment.php
index 1c095332..11d45587 100644
--- a/lib/model/comment.php
+++ b/lib/model/comment.php
@@ -30,7 +30,7 @@ class model_comment extends model_abstract
      *
      * @access public
      * @throws Exception
-     * @return stdObject
+     * @return stdClass
      */
     public function get()
     {
diff --git a/lib/model/paste.php b/lib/model/paste.php
index 1aadfbce..090f126c 100644
--- a/lib/model/paste.php
+++ b/lib/model/paste.php
@@ -22,11 +22,13 @@ class model_paste extends model_abstract
      *
      * @access public
      * @throws Exception
-     * @return stdObject
+     * @return stdClass
      */
     public function get()
     {
         $this->_data = $this->_store->read($this->getId());
+        if ($this->_data === false) throw new Exception(zerobin::GENERIC_ERROR, 64);
+
         // check if paste has expired and delete it if neccessary.
         if (property_exists($this->_data->meta, 'expire_date'))
         {