diff --git a/server/gamedb.js b/server/gamedb.js
index <HASH>..<HASH> 100644
--- a/server/gamedb.js
+++ b/server/gamedb.js
@@ -53,6 +53,10 @@ var GameDB = function(options) {
   var cwd = process.cwd();
 
   options.gamesDirs.forEach(function(basePath) {
+    if (!fs.existsSync(basePath)) {
+      console.warn("WARNING: " + basePath + " does not exist");
+      return;
+    }
     var filenames = fs.readdirSync(basePath);
     filenames.forEach(function(filename) {
       if (strings.startsWith(filename, '.')) {
diff --git a/server/server.js b/server/server.js
index <HASH>..<HASH> 100644
--- a/server/server.js
+++ b/server/server.js
@@ -85,7 +85,10 @@ console.log("using ip address: " + g.address);
 
 var gameDB = new GameDB({
   baseDir: g.baseDir,
-  gamesDirs: [path.join(g.baseDir, "/examples")],
+  gamesDirs: [
+      path.join(g.baseDir, "/examples"),
+      path.join(g.baseDir, "/games"),
+  ],
 });
 
 function postHandler(request, callback) {
Add games as another subfolder to look for games.