diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
index 5ae75769acb..1bbbc5be2d3 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
@@ -277,27 +277,23 @@ protected Object checkInstanceLocation(Shell shell, Map applicationArguments) {
 					// 1. directory is already in use
 					// 2. directory could not be created
 					File workspaceDirectory = new File(instanceLoc.getURL().getFile());
-					if (workspaceDirectory.exists()) {
-						if (isDevLaunchMode(applicationArguments)) {
-							return EXIT_WORKSPACE_LOCKED;
-						}
+					boolean workspaceDirectoryExists = workspaceDirectory.exists();
 
-						// check if there is a lock info then append it to error message.
-						String lockInfo = WorkspaceLock.getWorkspaceLockDetails(instanceLoc.getURL());
-						if (lockInfo != null) {
-							hideSplash(shell);
-							WorkspaceLock.showWorkspaceLockedDialog(shell, workspaceDirectory.getAbsolutePath(),
-									lockInfo);
-						} else {
-							hideSplash(shell);
-							MessageDialog.openError(shell,
-									IDEWorkbenchMessages.IDEApplication_workspaceCannotBeSetTitle,
-									IDEWorkbenchMessages.IDEApplication_workspaceCannotBeSetMessage);
-						}
+					// In dev (PDE) launch mode let the launcher report the locked workspace.
+					if (workspaceDirectoryExists && isDevLaunchMode(applicationArguments)) {
+						return EXIT_WORKSPACE_LOCKED;
+					}
+
+					// If the directory exists and carries lock info, show it; otherwise
+					// report that the workspace location could not be set.
+					String lockInfo = workspaceDirectoryExists
+							? WorkspaceLock.getWorkspaceLockDetails(instanceLoc.getURL())
+							: null;
+					hideSplash(shell);
+					if (lockInfo != null) {
+						WorkspaceLock.showWorkspaceLockedDialog(shell, workspaceDirectory.getAbsolutePath(), lockInfo);
 					} else {
-						hideSplash(shell);
-						MessageDialog.openError(
-								shell,
+						MessageDialog.openError(shell,
 								IDEWorkbenchMessages.IDEApplication_workspaceCannotBeSetTitle,
 								IDEWorkbenchMessages.IDEApplication_workspaceCannotBeSetMessage);
 					}