diff --git a/server/routes/photos.js b/server/routes/photos.js
index 857761d..3c03aff 100755
--- a/server/routes/photos.js
+++ b/server/routes/photos.js
@@ -538,7 +538,6 @@ router.get("/duplicates", function(req, res/*, next*/) {
     duplicates.forEach(function(duplicate) {
       filenames.push(duplicate.filename);
     });
-    
     replacements.filenames = filenames;
 
     return photoDB.sequelize.query(
diff --git a/server/scanner.js b/server/scanner.js
index 54135cd..5c08f43 100755
--- a/server/scanner.js
+++ b/server/scanner.js
@@ -411,7 +411,7 @@ function processBlock(items) {
     setStatus("Looking for removed assets");
     return photoDB.sequelize.query("SELECT photos.scanned,photos.id,photos.filename,albums.path FROM photos " +
         "LEFT JOIN albums ON (albums.id=photos.albumId) " +
-        "WHERE photos.deleted=0 AND DATETIME(photos.scanned)<DATETIME(:lastScan)", {
+        "WHERE photos.deleted=0 AND (DATETIME(photos.scanned)<DATETIME(:lastScan) OR photos.scanned IS NULL)", {
       replacements: {
         lastScan: lastScan
       },
@@ -715,7 +715,7 @@ function doScan() {
              * 
              * Can only do this after a full scan has occurred */
             if (lastScan != null && asset.stats.mtime < lastScan && asset.stats.ctime < lastScan) {
-            return asset;
+              return asset;
             }
 
             return findOrUpdateDBAsset(transaction, asset).then(function(asset) {