diff --git a/src/App.jsx b/src/App.jsx
index f8a3fcd..3bf185b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -42,11 +42,15 @@ class App extends Component {
           endTime: Date.now(),
         }}
         render={({ error, props }) => {
+          console.log(props);
           if (error) {
             return <div>{error.message}</div>;
+          } else if (props && typeof props !== 'undefined') {
+            return <Map trynState={props} />;
           }
-          return <Map trynState={props || null} />;
-        }}
+          return <div>Loading...</div>;
+          }
+        }
       />
     );
   }
diff --git a/src/Map.jsx b/src/Map.jsx
index b9dec50..864cf33 100644
--- a/src/Map.jsx
+++ b/src/Map.jsx
@@ -246,10 +246,10 @@ class Map extends Component {
 }
 
 Map.propTypes = {
-  trynState: propTypes.shape(
+  trynState: propTypes.shape([
     propTypes.string,
     propTypes.arrayOf(propTypes.object),
-  ).isRequired,
+  ]).isRequired,
 };
 
 export default createRefetchContainer(