Merge branch 'master' of github.com:launchdarkly/js-client

launchdarkly · Oct 26, 2016 · 4973a3f · 4973a3f
2 parents c269a28 + 80197ef
commit 4973a3f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -87,8 +87,8 @@ function identify(user, hash, onDone) {
 
 function variation(key, defaultValue) {
   var value;
-
-  if (flags.hasOwnProperty(key)) {
+    
+  if (flags && flags.hasOwnProperty(key)) {
     value = flags[key] === null ? defaultValue : flags[key];
   } else {
     value = defaultValue;
@@ -101,6 +101,9 @@ function variation(key, defaultValue) {
 
 function allFlags() {
   var results = {};
+
+  if (!flags) { return results; }
+
   for (var key in flags) {
     if (flags.hasOwnProperty(key)) {
       results[key] = variation(key, null);