Fix bug when only one of stderr or stdout is present

Cage, Gregoryrequested to merge
stdout-hot-fix into dev

Also should fix an issue with a non-json output under certain scenarios.

Merge request reports