diff --git a/lfs/pointer.go b/lfs/pointer.go
index a6e1ec94..49ee1763 100644
--- a/lfs/pointer.go
+++ b/lfs/pointer.go
@@ -113,7 +113,7 @@ func DecodeFrom(reader io.Reader) ([]byte, *Pointer, error) {
 	written, err := reader.Read(buf)
 	output := buf[0:written]
 
-	if err != nil {
+	if err != nil && err != io.EOF {
 		return output, nil, err
 	}
 
diff --git a/lfs/pointer_test.go b/lfs/pointer_test.go
index 246a158f..1327b3c0 100644
--- a/lfs/pointer_test.go
+++ b/lfs/pointer_test.go
@@ -3,7 +3,6 @@ package lfs
 import (
 	"bufio"
 	"bytes"
-	"io"
 	"reflect"
 	"strings"
 	"testing"
@@ -170,17 +169,10 @@ size 12345`
 
 func TestDecodeFromEmptyReader(t *testing.T) {
 	by, p, err := DecodeFrom(strings.NewReader(""))
-	if err != io.EOF {
-		t.Fatalf("unexpected error: %v", err)
-	}
 
-	if p != nil {
-		t.Fatalf("Unexpected pointer: %v", p)
-	}
-
-	if string(by) != "" {
-		t.Fatalf("unexpected result: '%s'", string(by))
-	}
+	assert.EqualError(t, err, "Pointer file error: invalid header")
+	assert.Nil(t, p)
+	assert.Empty(t, string(by))
 }
 
 func TestDecodeInvalid(t *testing.T) {