Revert "BS-1905 Add a connector generates a NPE"

This reverts commit e279c6a41f2960f8356490b735c6c94eecaa1fe4.
BS-1905
Add a connector generates a NPE