diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MemoizingDisposableSupplier.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MemoizingDisposableSupplier.java
index ce9ce7fc1..0fd636776 100644
--- a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MemoizingDisposableSupplier.java
+++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MemoizingDisposableSupplier.java
@@ -28,7 +28,7 @@ import reactor.core.Disposable;
  * <p>
  * Both real results and thrown exceptions are memoized.
  */
-public class MemoizingDisposableSupplier<T> implements Supplier<T>, Disposable {
+public class MemoizingDisposableSupplier<T> implements Disposable {
 	
 	private static Logger logger = LoggerFactory.getLogger(MemoizingDisposableSupplier.class);
 
@@ -73,8 +73,7 @@ public class MemoizingDisposableSupplier<T> implements Supplier<T>, Disposable {
 		}
 	}
 
-	@Override
-	public synchronized T get() {
+	public synchronized T get() throws Exception {
 		Assert.isLegal(!isDisposed());
 		if (shouldCompute()) {
 			lastComputed = System.currentTimeMillis();
@@ -91,7 +90,7 @@ public class MemoizingDisposableSupplier<T> implements Supplier<T>, Disposable {
 			}
 		}
 		if (failure!=null) {
-			throw ExceptionUtil.unchecked(failure);
+			throw ExceptionUtil.exception(failure);
 		} else {
 			return value;
 		}