diff --git a/app/app/components/document/document-view.js b/app/app/components/document/document-view.js
index 00fe3abc..084458e5 100644
--- a/app/app/components/document/document-view.js
+++ b/app/app/components/document/document-view.js
@@ -36,7 +36,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
     },
 
     noSections: Ember.computed('pages', function() {
-        return this.get('pages.length') === 1;
+        return this.get('pages.length') === 0;
     }),
 
     didInsertElement() {
@@ -159,4 +159,4 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
             this.get('documentService').save(doc);
         }
     }
-});
\ No newline at end of file
+});
diff --git a/documize/api/endpoint/page_endpoint.go b/documize/api/endpoint/page_endpoint.go
index 672e513e..14c83ed6 100644
--- a/documize/api/endpoint/page_endpoint.go
+++ b/documize/api/endpoint/page_endpoint.go
@@ -200,9 +200,8 @@ func GetDocumentPages(w http.ResponseWriter, r *http.Request) {
 		pages, err = p.GetPages(documentID)
 	}
 
-	if err == sql.ErrNoRows {
-		writeNotFoundError(w, method, documentID)
-		return
+	if len(pages) == 0 {
+		pages = []entity.Page{}
 	}
 
 	if err != nil {
diff --git a/documize/api/endpoint/templates_endpoint.go b/documize/api/endpoint/templates_endpoint.go
index 9ef80c04..78c6b05b 100644
--- a/documize/api/endpoint/templates_endpoint.go
+++ b/documize/api/endpoint/templates_endpoint.go
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -181,21 +181,22 @@ func StartDocumentFromSavedTemplate(w http.ResponseWriter, r *http.Request) {
 	// Define an empty document just in case user wanted one.
 	var err error
 	var d = entity.Document{}
-	d.Title = "Empty Document"
+	d.Title = "New Document"
 	d.Location = fmt.Sprintf("template-%s", templateID)
-	d.Excerpt = "Created from template"
+	d.Excerpt = "A new document"
 	d.Slug = utility.MakeSlug(d.Title)
 	d.Tags = ""
 	d.LabelID = folderID
 	documentID := util.UniqueID()
 	d.RefID = documentID
 
-	var pages = make([]entity.Page, 1, 1)
-	pages[0] = entity.Page{}
-	pages[0].Title = "Heading"
-	pages[0].Body = "<p>Some content here.</p>"
-	pages[0].Level = 1
-	pages[0].Sequence = 1
+	var pages = []entity.Page{}
+	//var pages = make([]entity.Page, 1, 1)
+	//pages[0] = entity.Page{}
+	//pages[0].Title = "Heading"
+	//pages[0].Body = "<p>Some content here.</p>"
+	//pages[0].Level = 1
+	//pages[0].Sequence = 1
 
 	var attachments = []entity.Attachment{}