Remove unnecessary throw
Make the addConnection() method a little more DRY