diff --git a/compiler/CodeGenerator.js b/compiler/CodeGenerator.js
index fcbb9b271..894770477 100644
--- a/compiler/CodeGenerator.js
+++ b/compiler/CodeGenerator.js
@@ -522,6 +522,11 @@ class Generator {
         } else if (value === false) {
             this.write('false');
         }  else if (isArray(value)) {
+            if (value.length === 0) {
+                this.write('[]');
+                return;
+            }
+
             this.write('[\n');
             this.incIndent();
 
@@ -549,12 +554,16 @@ class Generator {
         } else if (typeof value === 'number') {
             this.write(value.toString());
         } else if (typeof value === 'object') {
+            let keys = Object.keys(value);
+            if (keys.length === 0) {
+                this.write('{}');
+                return;
+            }
+
             this.incIndent();
             this.write('{\n');
             this.incIndent();
 
-            let keys = Object.keys(value);
-
             for (let i=0; i<keys.length; i++) {
                 let k = keys[i];
                 let v = value[k];