Merge pull request #7 from bcmi-labs/Fix-connection-initial-setup

Fix connection initial setup and additional error checking

Author: fabik111