ONOS-395 - tighten up exception handling

Change-Id: Ice3ee55adacbd890100def5d9da44c6e2a770945