diff --git a/http/handler/api/restream.go b/http/handler/api/process.go
similarity index 97%
rename from http/handler/api/restream.go
rename to http/handler/api/process.go
index 96a4f75c..f9a7e548 100644
--- a/http/handler/api/restream.go
+++ b/http/handler/api/process.go
@@ -553,23 +553,34 @@ func (h *RestreamHandler) getProcess(id, filterString string) (api.Process, erro
 	}
 
 	if wants["state"] {
-		if state, err := h.restream.GetProcessState(id); err == nil {
-			info.State = &api.ProcessState{}
-			info.State.Unmarshal(state)
+		state, err := h.restream.GetProcessState(id)
+		if err != nil {
+			return api.Process{}, err
 		}
+
+		info.State = &api.ProcessState{}
+		info.State.Unmarshal(state)
+
 	}
 
 	if wants["report"] {
-		if log, err := h.restream.GetProcessLog(id); err == nil {
-			info.Report = &api.ProcessReport{}
-			info.Report.Unmarshal(log)
+		log, err := h.restream.GetProcessLog(id)
+		if err != nil {
+			return api.Process{}, err
 		}
+
+		info.Report = &api.ProcessReport{}
+		info.Report.Unmarshal(log)
 	}
 
 	if wants["metadata"] {
-		if data, err := h.restream.GetProcessMetadata(id, ""); err == nil {
-			info.Metadata = api.NewMetadata(data)
+		data, err := h.restream.GetProcessMetadata(id, "")
+		if err != nil {
+			return api.Process{}, err
 		}
+
+		info.Metadata = api.NewMetadata(data)
+
 	}
 
 	return info, nil
diff --git a/http/handler/api/restream_test.go b/http/handler/api/process_test.go
similarity index 100%
rename from http/handler/api/restream_test.go
rename to http/handler/api/process_test.go