diff --git a/index.js b/index.js
index 62f377a..d3b3980 100644
--- a/index.js
+++ b/index.js
@@ -5,8 +5,8 @@ const {Runner}    = require('./lib/Runner');
 const config      = require(process.cwd() + '/boards.js');
 const task        = process.argv[2];
 const name        = process.argv[3];
-const pascalCased = name[0].toUpperCase() + name.substr(1);
-const upperCased  = name.replace(/([A-Z])/g, c => `_${c}`).toUpperCase();
+const pascalCased = name && name[0].toUpperCase() + name.substr(1);
+const upperCased  = name && name.replace(/([A-Z])/g, c => `_${c}`).toUpperCase();
 
 let runner = new Runner(config);