diff --git a/web/includes/Server.php b/web/includes/Server.php
index 5705c3ffb..79dbb7ddb 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,16 +1,18 @@
 <?php
 require_once( 'database.php' );
 class Server {
-    public function __construct( $IdOrRow ) {
+    public function __construct( $IdOrRow = NULL ) {
 		$row = NULL;
-		if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
-			$row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
-			if ( ! $row ) {
-				Error("Unable to load Server record for Id=" . $IdOrRow );
+		if ( $IdOrRow ) {
+			if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+				$row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
+				if ( ! $row ) {
+					Error("Unable to load Server record for Id=" . $IdOrRow );
+				}
+			} elseif ( is_array( $IdOrRow ) ) {
+				$row = $IdOrRow;
 			}
-		} elseif ( is_array( $IdOrRow ) ) {
-			$row = $IdOrRow;
-		}
+		} # end if isset($IdOrRow)
 		if ( $row ) {
 			foreach ($row as $k => $v) {
 				$this->{$k} = $v;