diff --git a/client_test.go b/client_test.go
index 161dc11..1f9cf81 100644
--- a/client_test.go
+++ b/client_test.go
@@ -104,6 +104,20 @@ func testConn(t *testing.T, disableEPSV bool) {
 		t.Errorf("file size %q, expected %q", fileSize, 14)
 	}
 
+	data = bytes.NewBufferString("")
+	err = c.Stor("tset", data)
+	if err != nil {
+		t.Error(err)
+	}
+
+	fileSize, err = c.FileSize("tset")
+	if err != nil {
+		t.Error(err)
+	}
+	if fileSize != 0 {
+		t.Errorf("file size %q, expected %q", fileSize, 0)
+	}
+
 	fileSize, err = c.FileSize("not-found")
 	if err == nil {
 		t.Fatal("expected error, got nil")
diff --git a/ftp.go b/ftp.go
index 03dd7c7..b2b491e 100644
--- a/ftp.go
+++ b/ftp.go
@@ -414,12 +414,7 @@ func (c *ServerConn) FileSize(path string) (int64, error) {
 		return 0, err
 	}
 
-	size, err := strconv.ParseInt(msg, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return size, nil
+	return strconv.ParseInt(msg, 10, 64)
 }
 
 // Retr issues a RETR FTP command to fetch the specified file from the remote