diff --git a/src/hyperimpute/plugins/imputers/plugin_EM.py b/src/hyperimpute/plugins/imputers/plugin_EM.py
index 9956e3d..bc7add4 100644
--- a/src/hyperimpute/plugins/imputers/plugin_EM.py
+++ b/src/hyperimpute/plugins/imputers/plugin_EM.py
@@ -6,6 +6,7 @@
 import numpy as np
 import pandas as pd
 from sklearn.base import TransformerMixin
+from sklearn.impute import SimpleImputer
 
 # hyperimpute absolute
 import hyperimpute.logger as log
@@ -187,10 +188,11 @@ def _impute_em(self, X: np.ndarray) -> np.ndarray:
                 log.critical(f"EM step failed. {e}")
                 break
 
-        if np.all(np.isnan(X_reconstructed)):
-            err = "The imputed result contains nan. This is a bug. Please report it on the issue tracker."
-            log.critical(err)
-            raise RuntimeError(err)
+        if np.any(np.isnan(X_reconstructed)):
+            # fallback to mean imputation in case of singular matrix.
+            X_reconstructed = SimpleImputer(strategy="mean").fit_transform(
+                X_reconstructed
+            )
 
         return X_reconstructed
 
@@ -231,7 +233,7 @@ def __init__(
     ) -> None:
         super().__init__(random_state=random_state)
 
-        self._model = EM()
+        self._model = EM(maxit=maxit, convergence_threshold=convergence_threshold)
 
     @decorators.benchmark
     def _fit(self, X: pd.DataFrame, *args: Any, **kwargs: Any) -> "EMPlugin":
diff --git a/src/hyperimpute/plugins/imputers/plugin_gain.py b/src/hyperimpute/plugins/imputers/plugin_gain.py
index a526892..817b85d 100644
--- a/src/hyperimpute/plugins/imputers/plugin_gain.py
+++ b/src/hyperimpute/plugins/imputers/plugin_gain.py
@@ -293,7 +293,7 @@ def transform(self, Xmiss: torch.Tensor) -> torch.Tensor:
             imputed_data[:, i] = imputed_data[:, i] * (max_val[i] + EPS)
             imputed_data[:, i] = imputed_data[:, i] + min_val[i]
 
-        if np.all(np.isnan(imputed_data.detach().cpu().numpy())):
+        if np.any(np.isnan(imputed_data.detach().cpu().numpy())):
             err = "The imputed result contains nan. This is a bug. Please report it on the issue tracker."
             log.critical(err)
             raise RuntimeError(err)
diff --git a/src/hyperimpute/plugins/imputers/plugin_softimpute.py b/src/hyperimpute/plugins/imputers/plugin_softimpute.py
index 27a38af..c294406 100644
--- a/src/hyperimpute/plugins/imputers/plugin_softimpute.py
+++ b/src/hyperimpute/plugins/imputers/plugin_softimpute.py
@@ -167,7 +167,7 @@ def _svd(self, X: np.ndarray, shrink_val: float) -> np.ndarray:
         s_thresh = np.diag(s_thresh)
         X_reconstructed = np.dot(U_thresh, np.dot(s_thresh, V_thresh))
 
-        if np.all(np.isnan(X_reconstructed)):
+        if np.any(np.isnan(X_reconstructed)):
             err = "The imputed result contains nan. This is a bug. Please report it on the issue tracker."
             log.critical(err)
             raise RuntimeError(err)
diff --git a/src/hyperimpute/version.py b/src/hyperimpute/version.py
index bfb34d3..8f5dd8f 100644
--- a/src/hyperimpute/version.py
+++ b/src/hyperimpute/version.py
@@ -1,4 +1,4 @@
-__version__ = "0.1.16"
+__version__ = "0.1.17"
 
 MAJOR_VERSION = ".".join(__version__.split(".")[:-1])
 MINOR_VERSION = __version__.split(".")[-1]
diff --git a/tests/imputers/test_em.py b/tests/imputers/test_em.py
index 51a6840..356441e 100644
--- a/tests/imputers/test_em.py
+++ b/tests/imputers/test_em.py
@@ -57,7 +57,7 @@ def test_em_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.slow
@@ -66,7 +66,7 @@ def test_em_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
 @pytest.mark.parametrize("p_miss", [0.5])
 @pytest.mark.parametrize(
     "other_plugin",
-    [Imputers().get("mean"), Imputers().get("median"), Imputers().get("most_frequent")],
+    [Imputers().get("most_frequent")],
 )
 def test_compare_methods_perf(
     test_plugin: ImputerPlugin, mechanism: str, p_miss: float, other_plugin: Any
diff --git a/tests/imputers/test_gain.py b/tests/imputers/test_gain.py
index 4a91032..3831922 100644
--- a/tests/imputers/test_gain.py
+++ b/tests/imputers/test_gain.py
@@ -57,7 +57,7 @@ def test_gain_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.slow
diff --git a/tests/imputers/test_ice.py b/tests/imputers/test_ice.py
index 8ad5278..3c1e802 100644
--- a/tests/imputers/test_ice.py
+++ b/tests/imputers/test_ice.py
@@ -57,7 +57,7 @@ def test_ice_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
     with pytest.raises(ValueError):
         test_plugin.fit_transform({"invalid": "input"})
diff --git a/tests/imputers/test_mice.py b/tests/imputers/test_mice.py
index 728bb33..cab020f 100644
--- a/tests/imputers/test_mice.py
+++ b/tests/imputers/test_mice.py
@@ -65,7 +65,7 @@ def test_mice_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
     with pytest.raises(ValueError):
         test_plugin.fit_transform({"invalid": "input"})
diff --git a/tests/imputers/test_missforest.py b/tests/imputers/test_missforest.py
index 7319cb3..cc88a5e 100644
--- a/tests/imputers/test_missforest.py
+++ b/tests/imputers/test_missforest.py
@@ -59,7 +59,7 @@ def test_missforest_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.parametrize("test_plugin", [from_api(), from_module(), from_serde()])
diff --git a/tests/imputers/test_miwae.py b/tests/imputers/test_miwae.py
index 957b29a..9d3a69a 100644
--- a/tests/imputers/test_miwae.py
+++ b/tests/imputers/test_miwae.py
@@ -57,7 +57,7 @@ def test_miwae_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.slow
diff --git a/tests/imputers/test_sinkhorn.py b/tests/imputers/test_sinkhorn.py
index e90b5f0..c0218f7 100644
--- a/tests/imputers/test_sinkhorn.py
+++ b/tests/imputers/test_sinkhorn.py
@@ -57,7 +57,7 @@ def test_sinkhorn_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.slow
diff --git a/tests/imputers/test_sklearn_ice.py b/tests/imputers/test_sklearn_ice.py
index a6d84ee..c8bb31e 100644
--- a/tests/imputers/test_sklearn_ice.py
+++ b/tests/imputers/test_sklearn_ice.py
@@ -57,7 +57,7 @@ def test_ice_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
     with pytest.raises(ValueError):
         test_plugin.fit_transform({"invalid": "input"})
diff --git a/tests/imputers/test_sklearn_missforest.py b/tests/imputers/test_sklearn_missforest.py
index 743d31b..eaa40da 100644
--- a/tests/imputers/test_sklearn_missforest.py
+++ b/tests/imputers/test_sklearn_missforest.py
@@ -57,7 +57,7 @@ def test_sklearn_missforest_plugin_fit_transform(test_plugin: ImputerPlugin) ->
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.parametrize("test_plugin", [from_api(), from_module(), from_serde()])
diff --git a/tests/imputers/test_softimpute.py b/tests/imputers/test_softimpute.py
index d1c1d8e..4171ae2 100644
--- a/tests/imputers/test_softimpute.py
+++ b/tests/imputers/test_softimpute.py
@@ -59,7 +59,7 @@ def test_softimpute_plugin_fit_transform(test_plugin: ImputerPlugin) -> None:
         )
     )
 
-    assert not np.all(np.isnan(res))
+    assert not np.any(np.isnan(res))
 
 
 @pytest.mark.slow