BRANCH 4.1: fix bug where returned was assumed an sobject, but was really a list