diff --git a/SocketIOClientSwift/SocketFixUTF8.swift b/SocketIOClientSwift/SocketFixUTF8.swift
index 5ca3ab2..c8ea8ef 100644
--- a/SocketIOClientSwift/SocketFixUTF8.swift
+++ b/SocketIOClientSwift/SocketFixUTF8.swift
@@ -26,7 +26,7 @@
 import Foundation
 
 func fixDoubleUTF8(inout name:String) {
-    let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding, allowLossyConversion: false)!
+    let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)!
     let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)!
     name = latin1 as String
 }
diff --git a/SocketIOClientSwift/SocketLogger.swift b/SocketIOClientSwift/SocketLogger.swift
index fceb2ee..b4c60f6 100644
--- a/SocketIOClientSwift/SocketLogger.swift
+++ b/SocketIOClientSwift/SocketLogger.swift
@@ -33,18 +33,22 @@ final class SocketLogger {
     private static let printQueue = dispatch_queue_create("printQueue", DISPATCH_QUEUE_SERIAL)
     
     static func log(message:String, client:SocketLogClient, altType:String? = nil) {
+        if !client.log {
+            return
+        }
+        
         dispatch_async(printQueue) {
-            if client.log {
-                NSLog("%@: %@", altType ?? client.logType, message)
-            }
+            NSLog("%@: %@", altType ?? client.logType, message)
         }
     }
     
     static func err(message:String, client:SocketLogClient, altType:String? = nil) {
+        if !client.log {
+            return
+        }
+        
         dispatch_async(printQueue) {
-            if client.log {
-                NSLog("ERROR %@: %@", altType ?? client.logType, message)
-            }
+            NSLog("ERROR %@: %@", altType ?? client.logType, message)
         }
     }
 }