diff --git a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
index 65e95a91c..7b9bffd79 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
@@ -39,7 +39,7 @@ object RepositoryCreationService {
   }
 
   def getCreationError(owner: String, repository: String): Option[String] = {
-    Option(Creating.get(s"${owner}/${repository}")).getOrElse(None)
+    Option(Creating.remove(s"${owner}/${repository}")).getOrElse(None)
   }
 
 }
diff --git a/src/main/twirl/gitbucket/core/repo/creating.scala.html b/src/main/twirl/gitbucket/core/repo/creating.scala.html
index 8c4e753ef..715a5b59c 100644
--- a/src/main/twirl/gitbucket/core/repo/creating.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/creating.scala.html
@@ -2,10 +2,16 @@
 @gitbucket.core.html.main("Creating...") {
   <div class="content-wrapper main-center">
     <div class="content body">
-      <div class="text-center">
+        <!-- Progress bar -->
+      <div class="text-center" id="progress">
         <h2>Creating repository...</h2>
         <img src="@context.path/assets/common/images/indicator-bar.gif"/>
       </div>
+        <!-- Error message -->
+      <div id="error" style="display: none;">
+        <h1>Failed to create repository</h1>
+        <div id="errorMessage"></div>
+      </div>
     </div>
   </div>
 }
@@ -21,8 +27,9 @@
         setTimeout(checkCreating, 2000);
       } else {
         if (data.error) {
-          alert(data.error);
-          location.href = '@context.path/new';
+          $('#errorMessage').text(data.error);
+          $('#error').show();
+          $('#progress').hide();
         } else {
           location.href = '@context.path/@owner/@repository';
         }