diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 8ec6c84..be57dd0 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -523,19 +523,19 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
 
     /**
     Write a message, independent of transport.
-    */
+     */
     public func write(msg: String, withType type: SocketEnginePacketType, withData data: [NSData]) {
         dispatch_async(emitQueue) {
-            if self.connected {
-                if self.websocket {
-                    DefaultSocketLogger.Logger.log("Writing ws: %@ has data: %@",
-                        type: self.logType, args: msg, data.count != 0)
-                    self.sendWebSocketMessage(msg, withType: type, withData: data)
-                } else {
-                    DefaultSocketLogger.Logger.log("Writing poll: %@ has data: %@",
-                        type: self.logType, args: msg, data.count != 0)
-                    self.sendPollMessage(msg, withType: type, withData: data)
-                }
+            guard self.connected else { return }
+            
+            if self.websocket {
+                DefaultSocketLogger.Logger.log("Writing ws: %@ has data: %@",
+                    type: self.logType, args: msg, data.count != 0)
+                self.sendWebSocketMessage(msg, withType: type, withData: data)
+            } else {
+                DefaultSocketLogger.Logger.log("Writing poll: %@ has data: %@",
+                    type: self.logType, args: msg, data.count != 0)
+                self.sendPollMessage(msg, withType: type, withData: data)
             }
         }
     }
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index 6583116..928203b 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -68,7 +68,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
         
         self.socketURL = socketURL["https?://"] ~= ""
         
-        for option in options ?? [] {
+        for option in options {
             switch option {
             case .ConnectParams(let params):
                 connectParams = params