diff --git a/maia/maiaXmlRpcServerConnection.cpp b/maia/maiaXmlRpcServerConnection.cpp
index fbca01b..aea97a6 100644
--- a/maia/maiaXmlRpcServerConnection.cpp
+++ b/maia/maiaXmlRpcServerConnection.cpp
@@ -37,7 +37,9 @@ MaiaXmlRpcServerConnection::MaiaXmlRpcServerConnection(QTcpSocket *connection, b
 }
 
 MaiaXmlRpcServerConnection::~MaiaXmlRpcServerConnection() {
-	clientConnection->deleteLater();
+	if (clientConnection) {
+		clientConnection->deleteLater();
+	}
 	delete header;
 }
 
diff --git a/maia/maiaXmlRpcServerConnection.h b/maia/maiaXmlRpcServerConnection.h
index 225ad55..b98b274 100644
--- a/maia/maiaXmlRpcServerConnection.h
+++ b/maia/maiaXmlRpcServerConnection.h
@@ -96,7 +96,7 @@ class MaiaXmlRpcServerConnection : public QObject {
 			        const QByteArray &method, const QList<QByteArray> argTypes);
 		
 
-		QTcpSocket *clientConnection;
+		QPointer<QTcpSocket> clientConnection;
 		bool mAllowPersistentConnection;
 		QString headerString;
 		QHttpRequestHeader *header;