Improved error handling and consolodated inbound addresses into a single address. Fixed propagation bug when using newly generated addresses.