                         , (err,reply) =>
                             @log.error "Error sending group source #{msg.key}/#{source.uuid}: #{err}" if err
                             af()
+                else
+                    af()
 
 
         # -- Stream Rewind Buffers and Sources -- #

                            @log.error "Error loading rewind buffer: #{err}" if err
                            c.end()

                    rpc.request "stream_rewind", key:key,path:spath, (err) =>
                        return @log.error "Error loading rewind buffer for #{key}: #{err}" if err
                        @log.info "Rewind buffer loaded for #{key}"


            source = new (require "../sources/#{msg.type}") _.extend {}, msg.opts, sock:handle, logger:stream.log
            stream.addSource source
            @log.info "Added stream source: #{stream.key}/#{source.uuid}"
            cb null

        rpc.on "group_source", (msg,handle,cb) =>
            sg = @stream_groups[ msg.group ]
            source = new (require "../sources/#{msg.type}") _.extend {}, msg.opts, sock:handle, logger:stream.log
            sg._stream.addSource source
            @log.info "Added group source: #{stream.key}/#{source.uuid}"
            cb null

        af = _.after (Object.keys(@streams).length+Object.keys(@stream_groups).length), =>
            cb null
