HURLIB-16 fixed null value issue, minor cleanup