fixed possible null value in client side collections