diff --git a/Changes.md b/Changes.md
index f164464..392192a 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,6 @@
+2007/03/28
+		- some handlers where not seeting rawdata
+
 2007/03/19
 		- Fixed nic.br ip handler detection
 
diff --git a/example.php b/example.php
index 8b4aae8..b472ad2 100644
--- a/example.php
+++ b/example.php
@@ -84,7 +84,10 @@ if (isSet($_GET['query']))
 				}
 			else
 				{
-				$winfo= implode($whois->Query['errstr'],"\n<br></br>");
+				if (isset($whois->Query['errstr']))
+					$winfo = implode($whois->Query['errstr'],"\n<br></br>");
+				else
+					$winfo = 'Unexpected error';
 				}       
 			break;
 
diff --git a/src/whois.client.php b/src/whois.client.php
index 18af34a..53eb1d1 100755
--- a/src/whois.client.php
+++ b/src/whois.client.php
@@ -215,8 +215,14 @@ class WhoisClient {
 
 		// If we have a handler, post-process it with that
 		if (isSet($this->Query['handler']))
+			{
 			$result = $this->Process($result,$deep_whois);
-
+		
+			// Handler may fortget to set rawdata
+			if (!isset($result['rawdata']))
+				$result['rawdata'] = $output;
+			}
+			
 		// Set whois server
 		if (!isset($result['regyinfo']['whois']))
 			$result['regyinfo']['whois'] = $this->Query['server'];