diff --git a/.travis.yml b/.travis.yml
index f439e49c..6ad35c3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@ before_install:
   - |
     set -e ;
     set -x ;
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
+        # Workaround for broken OS X build, see https://github.com/travis-ci/travis-ci/issues/8703
+        unset -f cd ;
+    fi
     case "$ONIG_VERSION" in
     "DEFAULT")
         if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
diff --git a/tailer/fileTailer.go b/tailer/fileTailer.go
index 61486175..09cf44e2 100644
--- a/tailer/fileTailer.go
+++ b/tailer/fileTailer.go
@@ -71,7 +71,7 @@ func runFileTailer(path string, readall bool, failOnMissingFile bool, logger sim
 		closed: false,
 	}
 
-	file, abspath, err := openLogfile(path, readall, failOnMissingFile)
+	file, abspath, err := openLogfile(path, readall, failOnMissingFile) // file may be nil if failOnMissingFile is false and the file doesn't exist yet.
 	if err != nil {
 		go func(err error) {
 			writeError(errors, done, "failed to initialize file system watcher for %v: %v", path, err)