diff --git a/core/modules/syncer.js b/core/modules/syncer.js
index 7a1e90ace..89295e2b5 100644
--- a/core/modules/syncer.js
+++ b/core/modules/syncer.js
@@ -460,7 +460,9 @@ Syncer.prototype.dispatchTask = function(task,callback) {
 				return callback(err);
 			}
 			// Store the tiddler
-			self.storeTiddler(tiddlerFields);
+			if(tiddlerFields) {
+				self.storeTiddler(tiddlerFields);
+			}
 			// Invoke the callback
 			callback(null);
 		});
diff --git a/plugins/tiddlywiki/filesystem/filesystemadaptor.js b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
index 4b370c868..d4a209c0b 100644
--- a/plugins/tiddlywiki/filesystem/filesystemadaptor.js
+++ b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
@@ -178,10 +178,12 @@ console.log("FileSystem: Saved file",fileInfo.filepath);
 
 /*
 Load a tiddler and invoke the callback with (err,tiddlerFields)
+
+We don't need to implement loading for the file system adaptor, because all the tiddler files will have been loaded during the boot process.
 */
 FileSystemAdaptor.prototype.loadTiddler = function(title,callback) {
 console.log("FileSystem: Loading",title);
-	callback(null,{title: title, text: "Fake tiddler: " + title});
+	callback(null,null);
 };
 
 /*