diff --git a/lib/emscripten-tests/tests/emtests/_common.rs b/lib/emscripten-tests/tests/emtests/_common.rs
index 8e4a70534..1e5dfba6e 100644
--- a/lib/emscripten-tests/tests/emtests/_common.rs
+++ b/lib/emscripten-tests/tests/emtests/_common.rs
@@ -42,7 +42,7 @@ macro_rules! assert_emscripten_output {
 
 //        let module = compile(&wasm_bytes[..])
 //            .map_err(|err| format!("Can't create the WebAssembly module: {}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ??
-        let mut emscripten_globals = EmscriptenGlobals::new(&module);
+        let mut emscripten_globals = EmscriptenGlobals::new(&module).expect("globals are valid");
         let import_object = generate_emscripten_env(&mut emscripten_globals);
 
         let mut instance = module.instantiate(&import_object)
diff --git a/lib/emscripten/src/utils.rs b/lib/emscripten/src/utils.rs
index af60215a9..246cd1686 100644
--- a/lib/emscripten/src/utils.rs
+++ b/lib/emscripten/src/utils.rs
@@ -42,7 +42,7 @@ pub fn get_emscripten_table_size(module: &Module) -> Result<(u32, Option<u32>),
 }
 
 pub fn get_emscripten_memory_size(module: &Module) -> Result<(Pages, Option<Pages>, bool), String> {
-    if module.info().imported_tables.len() == 0 {
+    if module.info().imported_memories.len() == 0 {
         return Err("Emscripten requires at least one imported memory".to_string());
     }
     let (_, memory) = &module.info().imported_memories[ImportedMemoryIndex::new(0)];