Index: trunk/Nebulous/lib/Nebulous/Server.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server.pm	(revision 16302)
+++ trunk/Nebulous/lib/Nebulous/Server.pm	(revision 16354)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.51 2008-01-31 02:26:33 jhoblitt Exp $
+# $Id: Server.pm,v 1.52 2008-02-07 22:18:51 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -861,6 +861,15 @@
     $log->debug( "entered - @_" );
 
+    unless ($pattern) {
+        $log->debug( "leaving" );
+        return [];
+    }
+
+    # attempt to strip off neb:// if it exists
+    if ($pattern =~ m|^neb:|) {
+        $pattern = parse_neb_key($pattern);        
+    }
+
     my $query;
-
     eval {
         $query = $db->prepare_cached( $sql->find_objects );
Index: trunk/Nebulous/lib/Nebulous/Util.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Util.pm	(revision 16302)
+++ trunk/Nebulous/lib/Nebulous/Util.pm	(revision 16354)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Util.pm,v 1.9 2008-01-23 22:46:44 jhoblitt Exp $
+# $Id: Util.pm,v 1.10 2008-02-07 22:18:51 jhoblitt Exp $
 
 package Nebulous::Util;
@@ -83,4 +83,5 @@
 {
     my $text = shift;
+    return unless defined $text;
 
     # white space is not allowed