1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java
index 525efbe223..2d21f4058f 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java
@@ -56,8 +56,13 @@ public class GitURI {
 		try {
 			if (SCHEME_SCM.equals(uri.getScheme())) {
 				final String ssp = uri.getSchemeSpecificPart();
+				int indexOfSemicolon = ssp.indexOf(';');
+				if (indexOfSemicolon < 0) {
+					throw new IllegalArgumentException(
+							NLS.bind(CoreText.GitURI_InvalidSCMURL,
+									new String[] { uri.toString() }));
+				}
 				if (ssp.startsWith(SCHEME_GIT)) {
-					int indexOfSemicolon = ssp.indexOf(';');
 					URIish r = new URIish(ssp.substring(
 							SCHEME_GIT.length() + 1, indexOfSemicolon));
 					IPath p = null;