Better handle objects being returned.