Fix various exception paths

Fixes bug 1130723

Some bugs were introduced in https://review.openstack.org/#/c/20514/
this patch fixes the discovered errors.

Change-Id: I9ff75482fe2bc13dbb65e7d666035a13a19d5c98