diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st
index 43db9c8bdf..8353de625c 100644
--- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st
+++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st
@@ -89,9 +89,6 @@ IceTipLocalRepositoryPanel >> validate [
 		description: 'Please provide a project location!'.
 	self
 		assert: self location exists
-		description: 'Project location must exist!'.
-	self 
-		assert: (IceRepositoryCreator isGitRoot: self location)
-		description: 'Project location does not seems to be a valid git repository'
+		description: 'Project location must exist!'
 
 ]
diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
index 0febb5c23c..f48ffc4fc0 100644
--- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
+++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
@@ -22,12 +22,18 @@ Class {
 { #category : 'actions' }
 IceTipOptionDialogPresenter >> accept [
 
-	[ 
-	  self doAccept.
-	  self closeWindow ]
-		  on: IceError , IceWarning
-		  do: [ :e | 
-			  e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ]
+	[
+	(self selectedType class = IceTipLocalRepositoryPanel and: [
+		 (IceRepositoryCreator isGitRoot: self selectedType location) not ])
+		ifTrue: [
+			self inform: ('"{1}" git repository not found' format:
+					 { self selectedType location fullName }) ]
+		ifFalse: [
+			self doAccept.
+			self closeWindow ] ]
+		on: IceError , IceWarning
+		do: [ :e |
+			e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ]
 ]
 
 { #category : 'accessing' }