diff --git a/go/store/nbs/file_manifest.go b/go/store/nbs/file_manifest.go
index a5235961f9..100579691e 100644
--- a/go/store/nbs/file_manifest.go
+++ b/go/store/nbs/file_manifest.go
@@ -245,18 +245,19 @@ func (fm5 fileManifestV5) parseManifest(r io.Reader) (manifestContents, error) {
 	}
 
 	specs, err := parseSpecs(slices[prefixLen:])
-
 	if err != nil {
 		return manifestContents{}, err
 	}
 
 	lock, err := parseAddr(slices[2])
-
 	if err != nil {
 		return manifestContents{}, err
 	}
 
 	gcGen, err := parseAddr(slices[4])
+	if err != nil {
+		return manifestContents{}, err
+	}
 
 	return manifestContents{
 		vers:  slices[1],
diff --git a/go/store/nbs/table_set_test.go b/go/store/nbs/table_set_test.go
index 05deac44ff..0d740fad51 100644
--- a/go/store/nbs/table_set_test.go
+++ b/go/store/nbs/table_set_test.go
@@ -67,6 +67,7 @@ func TestTableSetToSpecsExcludesEmptyTable(t *testing.T) {
 	assert := assert.New(t)
 	ts := newFakeTableSet()
 	specs, err := ts.ToSpecs()
+	require.NoError(t, err)
 	assert.Empty(specs)
 	mt := newMemTable(testMemTableSize)
 	mt.addChunk(computeAddr(testChunks[0]), testChunks[0])
@@ -171,6 +172,7 @@ func TestTableSetRebase(t *testing.T) {
 	ts = insert(ts, []byte("novel"))
 
 	specs, err = fullTS.ToSpecs()
+	require.NoError(t, err)
 	ts, err = ts.Rebase(context.Background(), specs, nil)
 	require.NoError(t, err)
 	assert.Equal(4, ts.Size())