diff --git a/retrieval/format/processor0_0_1_test.go b/retrieval/format/processor0_0_1_test.go
index 7ce74bb6f..518c05341 100644
--- a/retrieval/format/processor0_0_1_test.go
+++ b/retrieval/format/processor0_0_1_test.go
@@ -131,7 +131,7 @@ func testProcessor001Process(t test.Tester) {
 
 		reader, err := os.Open(path.Join("fixtures", scenario.in))
 		if err != nil {
-			t.Fatalf("%d. couldn't open scenario input file %s: %s", scenario.in, err)
+			t.Fatalf("%d. couldn't open scenario input file %s: %s", i, scenario.in, err)
 		}
 
 		err = Processor001.Process(reader, time.Now(), scenario.baseLabels, inputChannel)
diff --git a/retrieval/format/processor0_0_2_test.go b/retrieval/format/processor0_0_2_test.go
index da0bce660..e8a3e4a6b 100644
--- a/retrieval/format/processor0_0_2_test.go
+++ b/retrieval/format/processor0_0_2_test.go
@@ -131,7 +131,7 @@ func testProcessor002Process(t test.Tester) {
 
 		reader, err := os.Open(path.Join("fixtures", scenario.in))
 		if err != nil {
-			t.Fatalf("%d. couldn't open scenario input file %s: %s", scenario.in, err)
+			t.Fatalf("%d. couldn't open scenario input file %s: %s", i, scenario.in, err)
 		}
 
 		err = Processor002.Process(reader, time.Now(), scenario.baseLabels, inputChannel)
diff --git a/storage/metric/tiered.go b/storage/metric/tiered.go
index 3f86f4cee..1d76e63fa 100644
--- a/storage/metric/tiered.go
+++ b/storage/metric/tiered.go
@@ -217,7 +217,6 @@ func (t *TieredStorage) Serve(started chan<- bool) {
 	t.mu.Lock()
 	if t.state != tieredStorageStarting {
 		panic("Illegal State: Attempted to restart TieredStorage.")
-		return
 	}
 
 	t.state = tieredStorageServing