Merge pull request #123 from tkrille/BT-33

[fix] added null check in extension join logic