diff --git a/lib/asyncqueue.js b/lib/asyncqueue.js
index f8b3b38c..2383056c 100644
--- a/lib/asyncqueue.js
+++ b/lib/asyncqueue.js
@@ -8,14 +8,21 @@ AsyncQueue.prototype.next = function () {
     if (this._q.length > 0) {
         if (!this.lock())
             return;
-        var fn = this._q.shift();
+        var item = this._q.shift();
+        var fn = item[0], tm = item[1];
+        this._tm = Date.now() + item[1];
         fn(this);
     }
 };
 
 AsyncQueue.prototype.lock = function () {
-    if (this._lock)
+    if (this._lock) {
+        if (this._tm > 0 && Date.now() > this._tm) {
+            this._tm = 0;
+            return true;
+        }
         return false;
+    }
 
     this._lock = true;
     return true;
@@ -27,7 +34,7 @@ AsyncQueue.prototype.release = function () {
         return false;
 
     self._lock = false;
-    process.nextTick(function () {
+    setImmediate(function () {
         self.next();
     });
     return true;
@@ -35,7 +42,7 @@ AsyncQueue.prototype.release = function () {
 
 AsyncQueue.prototype.queue = function (fn) {
     var self = this;
-    self._q.push(fn);
+    self._q.push([fn, 20000]);
     self.next();
 };
 
@@ -43,3 +50,5 @@ AsyncQueue.prototype.reset = function () {
     this._q = [];
     this._lock = false;
 };
+
+module.exports = AsyncQueue;
diff --git a/lib/get-info.js b/lib/get-info.js
index 613dec23..3bbe2ad9 100644
--- a/lib/get-info.js
+++ b/lib/get-info.js
@@ -23,6 +23,7 @@ module.exports = function (Server) {
         // This should cut down on needing to restart the server
         var d = domain.create();
         d.on("error", function (err) {
+            Logger.errlog.log(err.trace());
             Logger.errlog.log("urlRetrieve failed: " + err);
             Logger.errlog.log("Request was: " + options.host + options.path);
             callback(503, err);
@@ -88,7 +89,8 @@ module.exports = function (Server) {
                     callback(true, null);
                     return;
                 }
-
+                
+                var buffer = data;
                 try {
                     data = JSON.parse(data);
                     var seconds = data.entry.media$group.yt$duration.seconds;
@@ -599,6 +601,8 @@ module.exports = function (Server) {
         getMedia: function (id, type, callback) {
             if(type in this.Getters) {
                 this.Getters[type](id, callback);
+            } else {
+                callback("Unknown media type '" + type + "'", null);
             }
         }
     };
diff --git a/lib/playlist.js b/lib/playlist.js
index 1e59657b..38e5d405 100644
--- a/lib/playlist.js
+++ b/lib/playlist.js
@@ -10,6 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 */
 
 ULList = require("./ullist").ULList;
+var AsyncQueue = require("./asyncqueue");
 var Media = require("./media").Media;
 var AllPlaylists = {};
 
@@ -52,6 +53,7 @@ function Playlist(chan) {
     };
     this.lock = false;
     this.action_queue = [];
+    this.fnqueue = new AsyncQueue();
     this._qaInterval = false;
     AllPlaylists[name] = this;
 
@@ -247,7 +249,58 @@ Playlist.prototype.addCachedMedia = function(data, callback) {
     this.queueAction(action);
 }
 
-Playlist.prototype.addMedia = function(data, callback) {
+Playlist.prototype.addMedia = function (data, cb) {
+    var self = this;
+    if (data.type === "yp") {
+        this.addYouTubePlaylist(data, cb);
+        return;
+    }
+
+    this.fnqueue.queue(function (q) {
+        var afterData = function (m) {
+            if (data.maxlength && data.seconds > m.maxlength) {
+                setImmediate(function () {
+                    cb("Media is too long!", null);
+                });
+                q.release();
+                return;
+            }
+
+            var it = self.makeItem(m);
+            it.queueby = data.queueby;
+            it.temp = data.temp;
+            var pos = "append";
+            if(data.pos == "next") {
+                if (!self.current)
+                    pos = "prepend";
+                else
+                    pos = self.current.uid;
+            }
+            var err = self.add(it, pos);
+            setImmediate(function () {
+                cb(err, err ? null : it);
+            });
+            q.release();
+        };
+
+        if (typeof data.title === "string") {
+            afterData(new Media(data.id, data.title, data.seconds, data.type));
+        } else {
+            self.server.infogetter.getMedia(data.id, data.type,
+                                            function (e, m) {
+                if (e) {
+                    setImmediate(function () { cb(e, null); });
+                    q.release();
+                    return;
+                }
+            
+                afterData(m);
+            });
+        }
+    });
+};
+
+Playlist.prototype._addMedia = function(data, callback) {
 
     if(data.type == "yp") {
         this.addYouTubePlaylist(data, callback);
diff --git a/tests/naokosimulator2013.js b/tests/naokosimulator2013.js
new file mode 100644
index 00000000..d3eb2fdc
--- /dev/null
+++ b/tests/naokosimulator2013.js
@@ -0,0 +1,38 @@
+var fs = require('fs');
+var io = require('socket.io-client');
+var socket = io.connect('http://localhost:1337');
+socket.on('connect', function () {
+    socket.emit('login', { name: 'test', pw: 'test' });
+    socket.emit('joinChannel', { name: 'test' });
+});
+
+socket.on('queueFail', function (msg) {
+    console.log(msg);
+});
+
+/* Stress test adding a lot of videos in a very short timespan */
+
+function testAddVideos() {
+    var pl = fs.readFileSync('largepl.json') + '';
+    pl = JSON.parse(pl);
+    var ids = [];
+    for (var i = 0; i < pl.length; i++) {
+        if (pl[i].type === 'yt')
+            ids.push(pl[i].id);
+    }
+
+    for (var i = 0; i < ids.length; i++) {
+        (function (i) {
+            setTimeout(function () {
+                console.log('queue', ids[i]);
+                socket.emit('queue', {
+                    id: ids[i],
+                    type: 'yt',
+                    pos: 'end'
+                });
+            }, 1050 * i);
+        })(i);
+    }
+}
+
+testAddVideos();