diff --git a/dns.inc.php b/dns.inc.php
index a99adf3..ee98882 100644
--- a/dns.inc.php
+++ b/dns.inc.php
@@ -2,7 +2,7 @@
 /* -------------------------------------------------------------
 This file is the PurplePixie PHP DNS Query Classes
 
-The software is (C) Copyright 2008-2016 PurplePixie Systems
+The software is (C) Copyright 2008-2025 PurplePixie Systems
 
 This is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,3 +27,7 @@
 require_once __DIR__ . '/src/PurplePixie/PhpDns/DNSQuery.php';
 require_once __DIR__ . '/src/PurplePixie/PhpDns/DNSResult.php';
 require_once __DIR__ . '/src/PurplePixie/PhpDns/DNSTypes.php';
+
+require_once __DIR__ . '/src/PurplePixie/PhpDns/Exceptions/InvalidQueryTypeId.php';
+require_once __DIR__ . '/src/PurplePixie/PhpDns/Exceptions/InvalidQueryTypeName.php';
+require_once __DIR__ . '/src/PurplePixie/PhpDns/Exceptions/ConnectionFailure.php';
diff --git a/src/PurplePixie/PhpDns/DNSQuery.php b/src/PurplePixie/PhpDns/DNSQuery.php
index c790d73..9f9297d 100644
--- a/src/PurplePixie/PhpDns/DNSQuery.php
+++ b/src/PurplePixie/PhpDns/DNSQuery.php
@@ -57,6 +57,8 @@ class DNSQuery
 
     private string $lasterror = '';
 
+    private bool $connectionException = false;
+
     public function __construct(string $server, int $port = 53, int $timeout = 60, bool $udp = true, bool $debug = false, bool $binarydebug = false)
     {
         $this->server = $server;
@@ -357,7 +359,7 @@ private function readRecord(): array
 
     /**
      * @return DNSAnswer|false
-     * @throws Exceptions\InvalidQueryTypeName
+     * @throws Exceptions\InvalidQueryTypeName|Exceptions\ConnectionFailure
      */
     public function query(string $question, string $typeName = DNSTypes::NAME_A)
     {
@@ -374,8 +376,16 @@ public function query(string $question, string $typeName = DNSTypes::NAME_A)
         $errno = 0;
         $errstr = '';
 
-        if (!$socket = fsockopen($host, $this->port, $errno, $errstr, $this->timeout)) {
-            $this->setError('Failed to Open Socket');
+        if (!$socket = @fsockopen(
+                $host, 
+                $this->port, 
+                $errno, 
+                $errstr, 
+                $this->timeout)) 
+        {
+            $this->setError('Failed to Open Socket (Code '.$errno.', Message: '.$errstr.')');
+            if ($this->getConnectionException())
+                throw new Exceptions\ConnectionFailure('Failed to Open Socket (Code '.$errno.', Message: '.$errstr.')");');
             return false;
         }
 
@@ -742,4 +752,14 @@ public function getLasterror(): string
     {
         return $this->lasterror;
     }
+
+    public function getConnectionException(): bool
+    {
+        return $this->connectionException;
+    }
+
+    public function setConnectionException(bool $value): void
+    {
+        $this->connectionException = $value;
+    }
 }
diff --git a/src/PurplePixie/PhpDns/Exceptions/ConnectionFailure.php b/src/PurplePixie/PhpDns/Exceptions/ConnectionFailure.php
new file mode 100644
index 0000000..e1ef40f
--- /dev/null
+++ b/src/PurplePixie/PhpDns/Exceptions/ConnectionFailure.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright (C) 2025, David Cutting
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software.  If not, see www.gnu.org/licenses
+ *
+ * For more information see www.purplepixie.org/phpdns
+ */
+
+namespace PurplePixie\PhpDns\Exceptions;
+
+class ConnectionFailure extends \Exception {
+
+    public function __construct(string $message) {
+        parent::__construct('Socket Connection Failed: ' . $message);
+    }
+}
\ No newline at end of file
diff --git a/tests/DNSQueryTest.php b/tests/DNSQueryTest.php
index d0841b8..3d7fba4 100644
--- a/tests/DNSQueryTest.php
+++ b/tests/DNSQueryTest.php
@@ -23,6 +23,8 @@
 
 use PurplePixie\PhpDns\DNSQuery;
 
+use PurplePixie\PhpDns\DNSTypes;
+
 class DNSQueryTest extends TestCase
 {
     /**
@@ -36,6 +38,14 @@ public function testInvalidDNSTypeName(): void
         $query->query('google.com', 'invalid');
     }
 
+    public function testConnectionExceptionTCP(): void
+    {
+        $query = new DNSQuery("127.0.0.1", 53, 60, false);
+        $query->setConnectionException(true);
+        $this->expectException(\PurplePixie\PhpDns\Exceptions\ConnectionFailure::class);
+        $query->query('google.com', DNSTypes::NAME_A);
+    }
+
     public function testALookup() : void {
 
         $query = new DNSQuery("8.8.8.8");