Improve how command calls' return value is handled

Improve how command calls' return value is handled #3786