diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st
index 1942d45..3841edf 100644
--- a/repository/TiddlyWiki/TiddlyWiki.class.st
+++ b/repository/TiddlyWiki/TiddlyWiki.class.st
@@ -22,6 +22,7 @@ Class {
 TiddlyWiki class >> createFromRemote: aRemoteTWUrl in: aFolder [
 
 	| wiki |
+	aFolder hasChildren ifTrue: [ ^ nil ].
 	wiki := TiddlyWiki new 
 		remote: aRemoteTWUrl;
 		folder: aFolder;
@@ -35,7 +36,7 @@ TiddlyWiki class >> createFromRemote: aRemoteTWUrl in: aFolder named: aNameStrin
 
 	| wiki |
 	wiki := self createFromRemote: aRemoteTWUrl in: aFolder.
-	^ wiki name: aNameString 
+	^ wiki ifNotNil: [ ^ wiki name: aNameString ]
 ]
 
 { #category : #accessing }