Fixing bug with return codes being empty.