diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
index 5261d2cc2..7cdf89a7a 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
@@ -53,9 +53,12 @@ public abstract class AbstractCFHintsProvider implements Callable<Collection<YVa
 			// are generated by the target provider so they should be propagated
 			// as is without further
 			// transformation
-			if (ExceptionUtil.getThrowable(e, NoTargetsException.class) == null) {
+			Throwable noTargetsError = ExceptionUtil.getThrowable(e, NoTargetsException.class);
+			if (noTargetsError != null) {
+				throw new ValueParseException(ExceptionUtil.getMessage(noTargetsError));
+			} else {
 				// Log any other error
-				logger.log(Level.SEVERE, e.getMessage(), e);
+				logger.log(Level.SEVERE, ExceptionUtil.getMessage(e), e);
 
 				if (ExceptionUtil.getThrowable(e, IOException.class) != null) {
 					throw new ValueParseException(
@@ -65,8 +68,6 @@ public abstract class AbstractCFHintsProvider implements Callable<Collection<YVa
 					throw new ValueParseException(
 							"Failed to fetch values from Cloud Foundry. Please check the log for more details.");
 				}
-			} else {
-				throw e;
 			}
 		}
 		return hints;