diff --git a/hugolib/i18n.go b/hugolib/i18n.go
index a98e51291..e71f9d3a3 100644
--- a/hugolib/i18n.go
+++ b/hugolib/i18n.go
@@ -14,6 +14,8 @@
 package hugolib
 
 import (
+	"fmt"
+
 	"github.com/nicksnyder/go-i18n/i18n/bundle"
 	"github.com/spf13/hugo/source"
 	"github.com/spf13/hugo/tpl"
@@ -29,7 +31,7 @@ func loadI18n(sources []source.Input) error {
 		for _, r := range currentSource.Files() {
 			err := i18nBundle.ParseTranslationFileBytes(r.LogicalName(), r.Bytes())
 			if err != nil {
-				return err
+				return fmt.Errorf("Failed to load translations in file %q: %s", r.LogicalName(), err)
 			}
 		}
 	}
diff --git a/hugolib/site.go b/hugolib/site.go
index 5f02a2c7a..509c3bc6c 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -512,7 +512,9 @@ func (s *Site) reBuild(events []fsnotify.Event) (whatChanged, error) {
 	}
 
 	if len(i18nChanged) > 0 {
-		s.readI18nSources()
+		if err := s.readI18nSources(); err != nil {
+			jww.ERROR.Println(err)
+		}
 	}
 
 	// If a content file changes, we need to reload only it and re-render the entire site.