diff --git a/Sources/SignalRClient/HubConnection.swift b/Sources/SignalRClient/HubConnection.swift
index 8ebe08e..0f5e281 100644
--- a/Sources/SignalRClient/HubConnection.swift
+++ b/Sources/SignalRClient/HubConnection.swift
@@ -303,9 +303,7 @@ public actor HubConnection {
         let startTask = self.startTask
 
         stopDuringStartError = SignalRError.connectionAborted
-        if (handshakeRejector != nil) {
-            handshakeRejector!(SignalRError.connectionAborted)
-        }
+        handshakeRejector?(SignalRError.connectionAborted)
 
         await connection.stop(error: nil)
 
@@ -327,9 +325,7 @@ public actor HubConnection {
         }
 
         stopDuringStartError = SignalRError.connectionAborted
-        if (handshakeResolver != nil) {
-            handshakeRejector!(SignalRError.connectionAborted)
-        }
+        handshakeRejector?(SignalRError.connectionAborted)
 
         if (stopping) {
             await completeClose(error: error)
@@ -568,7 +564,7 @@ public actor HubConnection {
                         try await self.sendMessageInternal(.string(HandshakeProtocol.writeHandshakeRequest(handshakeRequest: handshakeRequest)))
                         logger.log(level: .debug, message: "Sent handshake request message with version: \(version), protocol: \(hubProtocol.name)")
                     } catch {
-                        self.handshakeRejector!(error)
+                        self.handshakeRejector?(error)
                     }
                 }
             }
@@ -620,20 +616,20 @@ public actor HubConnection {
             (remainingData, handshakeResponse) = try HandshakeProtocol.parseHandshakeResponse(data: content)
         } catch {
             logger.log(level: .error, message: "Error parsing handshake response: \(error)")
-            handshakeRejector!(error)
+            handshakeRejector?(error)
             throw error
         }
 
         if (handshakeResponse.error != nil) {
             logger.log(level: .error, message: "Server returned handshake error: \(handshakeResponse.error!)") 
             let error = SignalRError.handshakeError(handshakeResponse.error!)
-            handshakeRejector!(error)
+            handshakeRejector?(error)
             throw error
         } else {
             logger.log(level: .debug, message: "Handshake compeleted")
         }
 
-        handshakeResolver!(handshakeResponse)
+        handshakeResolver?(handshakeResponse)
         return remainingData
     }