diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index 152681d4..910706a4 100644
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"runtime"
 	"sort"
 
 	"github.com/go-errors/errors"
@@ -208,6 +209,13 @@ func main() {
 	}()
 
 	b := LoadInput()
+
+	if len(b) == 0 {
+		// No buffers to open
+		screen.Screen.Fini()
+		runtime.Goexit()
+	}
+
 	action.InitTabs(b)
 	action.InitGlobals()
 
diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index 16bc28f7..c9f56f50 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -133,7 +133,7 @@ func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
 	fileInfo, _ := os.Stat(filename)
 
 	if err == nil && fileInfo.IsDir() {
-		return nil, errors.New(filename + " is a directory")
+		return nil, errors.New("Error: " + filename + " is a directory and cannot be opened")
 	}
 
 	defer file.Close()