diff --git a/app.js b/app.js
index 1dd40e2..1f528b4 100644
--- a/app.js
+++ b/app.js
@@ -63,7 +63,7 @@ api.on('connection', function(spark) {
             var info = Nodes.add(data);
             spark.emit('ready');
 
-            if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.getNode({id: data.id}).canUpdate())
+            if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id))
             {
                 spark.emit('history', Nodes.getHistory().getHistoryRequestInterval());
                 askedForHistory = true;
@@ -87,7 +87,7 @@ api.on('connection', function(spark) {
                 client.write({action: 'charts', data: Nodes.getCharts()});
             }
 
-            if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.getNode({id: data.id}).canUpdate())
+            if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id))
             {
                 spark.emit('history', Nodes.getHistory().getHistoryRequestInterval());
                 askedForHistory = true;
diff --git a/models/collection.js b/models/collection.js
index c1666f7..d2c81c9 100644
--- a/models/collection.js
+++ b/models/collection.js
@@ -136,4 +136,12 @@ Collection.prototype.getHistory = function()
 	return this._history;
 }
 
+Collection.prototype.canNodeUpdate = function(id)
+{
+	var node = this.getNode({id: id});
+	if(!node)
+		return false;
+	return node.canUpdate();
+}
+
 module.exports = Collection;
\ No newline at end of file