diff --git a/SwiftIO/SocketEvent.swift b/SwiftIO/SocketEvent.swift
index dfc4d60..308f99c 100644
--- a/SwiftIO/SocketEvent.swift
+++ b/SwiftIO/SocketEvent.swift
@@ -112,38 +112,22 @@ class SocketEvent {
                 if nsp == "/" {
                     msg = "43\(ack)["
                     
-                    if args.count == 0 {
-                        return msg + "]"
-                    }
-                    
                     return self.completeMessage(msg, args: args)
                     
                 } else {
                     msg = "43/\(nsp),\(ack)["
                     
-                    if args.count == 0 {
-                        return msg + "]"
-                    }
-                    
                     return self.completeMessage(msg, args: args)
                 }
             } else {
                 if nsp == "/" {
                     msg = "46\(binary)-\(ack)["
                     
-                    if args.count == 0 {
-                        return msg + "]"
-                    }
-                    
                     return self.completeMessage(msg, args: args)
                     
                 } else {
                     msg = "46\(binary)-/\(nsp),\(ack)["
                     
-                    if args.count == 0 {
-                        return msg + "]"
-                    }
-                    
                     return self.completeMessage(msg, args: args)
                 }
             }
@@ -151,6 +135,11 @@ class SocketEvent {
     
     private class func completeMessage(var message:String, args:[AnyObject]) -> String {
         var err:NSError?
+        
+        if args.count == 0 {
+            return message + "]"
+        }
+        
         for arg in args {
             
             if arg is NSDictionary || arg is [AnyObject] {