CB-5012 ensure result is returned