[#2035] need to allow for non-zero return code