diff --git a/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java b/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java
index 30631a9..7d40afa 100644
--- a/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java
+++ b/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java
@@ -167,7 +167,7 @@ public Optional<List<String>> snippets(boolean includeStartupScript) throws Dock
             }
             return Optional.of(includeStartupScript ? snippets
                     : snippets.subList(startupScriptSize, snippets.size()));
-        } catch (IOException ex) {
+        } catch (Exception ex) {
             LOGGER.warn("Unexpected error.", ex);
             close();
             throw new DockerException(ex);
@@ -234,30 +234,15 @@ private void updateLastTimeout() {
     private void checkContainerOK() throws DockerException {
         try {
             if (dockerService.isDead(containerName())) {
-                try {
-                    close();
-                } finally {
-                    throw new DockerException("Container of session " + id + " is dead");
-                }
+                throw new IOException("Container of session " + id + " is dead");
             }
-            String OK = reader.readLine();
-            if (OK == null) {
-                try {
-                    close();
-                } finally {
-                    throw new DockerException("Container of session " + id + " is dead");
-                }
-            }
-            if (!OK.equals("OK")) {
-                try {
-                    close();
-                } finally {
-                    throw new DockerException(
-                            "Container of session " + id + " returned invalid info : " + OK);
-                }
+            String ok = reader.readLine();
+            if (ok == null || !ok.equals("OK")) {
+                throw new IOException(
+                        "Container of session " + id + " is dead because status was " + ok);
             }
         } catch (IOException ex) {
-            LOGGER.warn("Unexpected error.", ex);
+            close();
             throw new DockerException(ex);
         }
     }