JAVA-121 #fixes
Fix issue introduced in 124ac56e21202ec95639191ffcf6a72565ab44da