ZEN-14385: Return errors when they AREN'T nil
Merge pull request #1045 from control-center/feature/ZEN-14385

ZEN-14385: Return errors when they AREN'T nil