Fixes NPEs in ListVersions due to recent changes in binding schemes. Fixes EUCA-7137.