diff -r 57fc3a0563c9 -r f69966d2e6cb launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java --- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java Tue Dec 25 15:08:39 2012 +0100 +++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java Thu Dec 27 19:50:16 2012 +0100 @@ -188,7 +188,7 @@ for (;;) { int prev = methods.size(); try { - if (wait.await(timeOut, TimeUnit.MILLISECONDS)) { + if (wait != null && wait.await(timeOut, TimeUnit.MILLISECONDS)) { break; } } catch (InterruptedException ex) { @@ -275,6 +275,9 @@ } private void stopServerAndBrwsr(HttpServer server, Object[] brwsr) throws IOException { + if (brwsr == null) { + return; + } Process process = (Process)brwsr[0]; server.stop();