Added null check in BindingBuilder