michaelolof · michaelolof · Sep 8, 2019 · Sep 6, 2019
diff --git a/dist/proxy.js b/dist/proxy.js
diff --git a/dist/proxy.js.map b/dist/proxy.js.map
diff --git a/dist/submodule.js b/dist/submodule.js
diff --git a/dist/submodule.js.map b/dist/submodule.js.map
diff --git a/js/proxy.js b/js/proxy.js
diff --git a/js/proxy.js.map b/js/proxy.js.map
diff --git a/js/submodule.js b/js/submodule.js
diff --git a/js/submodule.js.map b/js/submodule.js.map
diff --git a/src/proxy.ts b/src/proxy.ts
@@ -298,7 +298,7 @@ function createGettersAndMutationProxyFromState({ cls, proxy, state, $store, nam
     if (currentField.length && !currentField.endsWith(".")) currentField += ".";
     const path = currentField + field;
 
-    if ( maxDepth === 0 || typeof value !== "object" ) {
+    if ( maxDepth === 0 || typeof value !== "object" || (typeof value === 'object' && !fieldIsSubmodule) ) {
 
       if( !strict || fieldIsSubmodule ) {
 

diff --git a/src/submodule.ts b/src/submodule.ts
@@ -3,7 +3,8 @@ import { extractVuexModule } from "./module";
 import { toCamelCase, getClassPath } from "./utils"
 
 export function isFieldASubModule( instance :VuexModule & Map, field :string ) {
-  return( 
+  return(
+    instance[ field ] != null &&
     typeof instance[ field ] === "object" && 
     instance[ field ][ "__submodule_type__" ] === "submodule" 
   )