Fix param crash and connect/disconnect
Merge pull request #1057 from DonLakeFlyer/MockLinkCrash

Fix param crash and connect/disconnect