diff --git a/migrate.go b/migrate.go
index 0a03621..c4f314e 100755
--- a/migrate.go
+++ b/migrate.go
@@ -7,8 +7,14 @@ import (
 )
 
 func migrate(pathToOldData, pathToData string) error {
-	files, _ := ioutil.ReadDir(pathToOldData)
+	files, err := ioutil.ReadDir(pathToOldData)
+	if len(files) == 0 {
+		return err
+	}
 	for _, f := range files {
+		if f.Mode().IsDir() {
+			continue
+		}
 		fmt.Printf("Migrating %s", f.Name())
 		p := Open(f.Name())
 		bData, err := ioutil.ReadFile(path.Join(pathToOldData, f.Name()))
@@ -19,7 +25,9 @@ func migrate(pathToOldData, pathToData string) error {
 		if err != nil {
 			return err
 		}
-		p.Save()
+		if err = p.Save(); err != nil {
+			return err
+		}
 	}
 	return nil
 }
diff --git a/page.go b/page.go
index f541d02..8ff9881 100755
--- a/page.go
+++ b/page.go
@@ -76,6 +76,8 @@ func (p *Page) Update(newText string) error {
 	return p.Save()
 }
 
+var rBracketPage = regexp.MustCompile(`\[\[(.*?)\]\]`)
+
 func (p *Page) Render() {
 	if p.IsEncrypted {
 		p.RenderedPage = "<code>" + p.Text.GetCurrent() + "</code>"
@@ -83,9 +85,8 @@ func (p *Page) Render() {
 	}
 
 	// Convert [[page]] to [page](/page/view)
-	r, _ := regexp.Compile("\\[\\[(.*?)\\]\\]")
 	currentText := p.Text.GetCurrent()
-	for _, s := range r.FindAllString(currentText, -1) {
+	for _, s := range rBracketPage.FindAllString(currentText, -1) {
 		currentText = strings.Replace(currentText, s, "["+s[2:len(s)-2]+"](/"+s[2:len(s)-2]+"/view)", 1)
 	}
 	p.Text.Update(currentText)