--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/CircuitBreaker.java	2009/10/20 10:26:50	450
+++ CircuitBreaker/src/dk/thoerup/curcuitbreaker/CircuitBreaker.java	2009/10/20 20:42:36	456
@@ -31,7 +31,7 @@
 		try {
 			String s = (String) cb.invoke(new TestInvocation("http://rafiki/test"));
 			response.getWriter().print(s);
-		} catch (Throwable e) {
+		} catch (Exception e) {
 			logger.warning( e.getMessage() );
 			response.sendError(500);
 			return;
@@ -104,6 +104,7 @@
     public void reset() {
     	synchronized(this) {
     		if (currentState != closed) { // TODO: Is this conditional necessary ??
+    			closed.resetFailureCount();
     			currentState = closed;
     			notifier.sendNotification(name, Notifier.Event.BreakerReset);
     		}