diff --git a/src/eng/underscore-generator.js b/src/eng/underscore-generator.js
index c2a0543..54be147 100644
--- a/src/eng/underscore-generator.js
+++ b/src/eng/underscore-generator.js
@@ -10,8 +10,8 @@ Underscore template generate for FluentCV.
   module.exports = function( json, jst, format, cssInfo, opts ) {
 
     // Tweak underscore's default template delimeters
-    var delims = opts.themeObj.delimeters || opts.template;
-    if( opts.themeObj.delimeters ) {
+    var delims = (opts.themeObj && opts.themeObj.delimeters) || opts.template;
+    if( opts.themeObj && opts.themeObj.delimeters ) {
       delims = _.mapObject( delims, function(val,key) {
         return new RegExp( val, "ig");
       });
diff --git a/src/gen/template-generator.js b/src/gen/template-generator.js
index 3788c8f..1fd47db 100644
--- a/src/gen/template-generator.js
+++ b/src/gen/template-generator.js
@@ -121,7 +121,8 @@ Template-based resume generator base for FluentCV.
         Object.keys( curFmt.symLinks ).forEach( function(loc) {
           var absLoc = PATH.join(outFolder, loc);
           var absTarg = PATH.join(PATH.dirname(absLoc), curFmt.symLinks[loc]);
-          var type = PATH.parse( absLoc ).ext ? 'file' : 'junction'; // 'file', 'dir', or 'junction' (Windows only)
+           // 'file', 'dir', or 'junction' (Windows only)
+          var type = PATH.parse( absLoc ).ext ? 'file' : 'junction';
           FS.symlinkSync( absTarg, absLoc, type);
         });
       }
@@ -140,7 +141,8 @@ Template-based resume generator base for FluentCV.
     */
     single: function( json, jst, format, cssInfo, opts ) {
       this.opts.freezeBreaks && ( jst = freeze(jst) );
-      var eng = require( '../eng/' + opts.themeObj.engine + '-generator' );
+      var eng = require( '../eng/' + ((opts.themeObj && opts.themeObj.engine) ||
+        opts.engine)  + '-generator' );
       var result = eng( json, jst, format, cssInfo, opts );
       this.opts.freezeBreaks && ( result = unfreeze(result) );
       return result;