diff --git a/src/Operations/Messages.php b/src/Operations/Messages.php
index 4445688..5ae2e47 100644
--- a/src/Operations/Messages.php
+++ b/src/Operations/Messages.php
@@ -42,7 +42,7 @@ public function get($server, SearchCriteria $searchCriteria, $timeout = 10000, \
             $datetime->sub(new \DateInterval('PT1H'));
         }
 
-        $result = $this->search($server, $searchCriteria, 0, 1, $timeout, $receivedAfter, $dir);
+        $result = $this->search($server, $searchCriteria, 0, 1, $timeout, $receivedAfter, true, $dir);
         return $this->getById($result->items[0]->id);
     }
 
@@ -208,7 +208,7 @@ public function search($server, SearchCriteria $searchCriteria, $page = 0, $item
                     return $result;
                 }
 
-                throw new MailosaurException("No matching messages found in time. By default, only messages received in the last hour are checked (use receivedAfter to override this).", "search_timeout");
+                throw new MailosaurException("No matching messages found in time. By default, only messages received in the last hour are checked (use receivedAfter to override this). The search criteria used for this query was [".$payload."] which timed out after ".$timeout."ms", "search_timeout");
             }
 
             sleep($delay / 1000);