diff --git a/SourceQuery/Socket.php b/SourceQuery/Socket.php
index 4f5cf9f..00f9325 100644
--- a/SourceQuery/Socket.php
+++ b/SourceQuery/Socket.php
@@ -42,13 +42,14 @@
 			$this->Port    = $Port;
 			$this->Address = $Address;
 			
-			$this->Socket = @FSockOpen( 'udp://' . $Address, $Port, $ErrNo, $ErrStr, $Timeout );
+			$Socket = @FSockOpen( 'udp://' . $Address, $Port, $ErrNo, $ErrStr, $Timeout );
 			
-			if( $ErrNo || $this->Socket === false )
+			if( $ErrNo || $Socket === false )
 			{
 				throw new SocketException( 'Could not create socket: ' . $ErrStr, SocketException::COULD_NOT_CREATE_SOCKET );
 			}
 			
+			$this->Socket = $Socket;
 			Stream_Set_Timeout( $this->Socket, $Timeout );
 			Stream_Set_Blocking( $this->Socket, true );
 		}
diff --git a/SourceQuery/SourceRcon.php b/SourceQuery/SourceRcon.php
index 0a77d58..e6d2566 100644
--- a/SourceQuery/SourceRcon.php
+++ b/SourceQuery/SourceRcon.php
@@ -57,13 +57,14 @@
 		{
 			if( !$this->RconSocket )
 			{
-				$this->RconSocket = @FSockOpen( $this->Socket->Address, $this->Socket->Port, $ErrNo, $ErrStr, $this->Socket->Timeout );
+				$RconSocket = @FSockOpen( $this->Socket->Address, $this->Socket->Port, $ErrNo, $ErrStr, $this->Socket->Timeout );
 				
-				if( $ErrNo || !$this->RconSocket )
+				if( $ErrNo || !$RconSocket )
 				{
 					throw new SocketException( 'Can\'t connect to RCON server: ' . $ErrStr, SocketException::CONNECTION_FAILED );
 				}
 				
+				$this->RconSocket = $RconSocket;
 				Stream_Set_Timeout( $this->RconSocket, $this->Socket->Timeout );
 				Stream_Set_Blocking( $this->RconSocket, true );
 			}