diff --git a/owa_base.php b/owa_base.php
index a51957e90..4bfc06b2a 100644
--- a/owa_base.php
+++ b/owa_base.php
@@ -90,20 +90,25 @@ function getMsg($code, $substitutions = []) {
 		
 		static $_owa_messages;
 		
+		$msg = array();
+		
 		if (empty($_owa_messages)) {
 			require_once(OWA_DIR.'conf/messages.php');
 		}
+		
+		if ( $code && array_key_exists( $code, $_owa_messages ) ) {
+			
+			$msg = $_owa_messages[$code];
 
-		$msg = $_owa_messages[$code];
-
-		if (isset($msg['headline'])) {
-            $msg['headline'] = vsprintf($msg['headline'], $substitutions['headline']);
-        }
-
-        if (isset($msg['message'])) {
-            $msg['message'] = vsprintf($msg['message'], $substitutions['message']);
-        }
-
+			if (isset($msg['headline'])) {
+	            $msg['headline'] = vsprintf($msg['headline'], $substitutions['headline']);
+	        }
+	
+	        if (isset($msg['message'])) {
+	            $msg['message'] = vsprintf($msg['message'], $substitutions['message']);
+	        }
+		}
+		
 		return $msg;
 	}
 
diff --git a/owa_wp.php b/owa_wp.php
deleted file mode 100644
index 3b9761fda..000000000
--- a/owa_wp.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-//
-// Open Web Analytics - An Open Source Web Analytics Framework
-//
-// Copyright 2006 Peter Adams. All rights reserved.
-//
-// Licensed under GPL v2.0 http://www.gnu.org/copyleft/gpl.html
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// $Id$
-//
-
-require_once(OWA_BASE_CLASS_DIR.'client.php');
-
-/**
- * Wordpress Caller class
- * 
- * @author      Peter Adams <peter@openwebanalytics.com>
- * @copyright   Copyright &copy; 2006 Peter Adams <peter@openwebanalytics.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GPL v2.0
- * @category    owa
- * @package     owa
- * @version		$Revision$	      
- * @since		owa 1.0.0
- */
-class owa_wp extends owa_client {
-	
-	/**
-	 * Constructor
-	 *
-	 * @return owa_wp
-	 */
-	
-	function __construct($config = null) {
-		
-		ob_start();
-		
-		return parent::__construct($config);
-	
-	}
-}
-
-?>
\ No newline at end of file