diff --git a/seahub/api2/endpoints/wikis.py b/seahub/api2/endpoints/wikis.py
index 93c920c240..4cbd938032 100644
--- a/seahub/api2/endpoints/wikis.py
+++ b/seahub/api2/endpoints/wikis.py
@@ -100,13 +100,11 @@ class WikisView(APIView):
             wiki = Wiki.objects.add(name, username, permission=permission,
                                     org_id=org_id)
         except DuplicateWikiNameError:
-            result['error'] = _('%s is taken by others, please try another name.') % name
-            return HttpResponse(json.dumps(result), status=400,
-                                content_type=content_type)
+            msg = _('%s is taken by others, please try another name.') % name
+            return api_error(status.HTTP_400_BAD_REQUEST, msg)
         except IntegrityError:
-            result['error'] = 'Internal Server Error'
-            return HttpResponse(json.dumps(result), status=500,
-                                content_type=content_type)
+            msg = 'Internal Server Error'
+            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, msg)
 
         # create home page
         page_name = "home.md"
@@ -115,8 +113,8 @@ class WikisView(APIView):
                                         page_name, request.user.username)
         except SearpcError as e:
             logger.error(e)
-            error_msg = 'Internal Server Error'
-            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
+            msg = 'Internal Server Error'
+            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, msg)
 
         return Response(wiki.to_dict())
 
diff --git a/tests/api/endpoints/test_wikis.py b/tests/api/endpoints/test_wikis.py
index 6288b5b4a5..912892c427 100644
--- a/tests/api/endpoints/test_wikis.py
+++ b/tests/api/endpoints/test_wikis.py
@@ -31,6 +31,8 @@ class WikisViewTest(BaseTestCase):
         assert json_resp['data'][0]['name'] == wiki.name
         assert 'wikis/test-wiki' in json_resp['data'][0]['link']
         assert json_resp['data'][0]['owner'] == self.user.username
+        print json_resp['data'][0]['created_at']
+        assert json_resp['data'][0]['created_at'] is not None
 
     def test_can_list_others(self):
         self.logout()
@@ -64,6 +66,8 @@ class WikisViewTest(BaseTestCase):
         self.assertEqual(200, resp.status_code)
 
         assert len(Wiki.objects.all()) == 1
+        w = Wiki.objects.all()[0]
+        assert w.created_at is not None
 
 
 class WikiViewTest(BaseTestCase):