Revert "Moving call out of try clause that didn't need to be wrapped"
Revert "Moving call out of try clause that didn't need to be wrapped"

This reverts commit 80ec16473360d1c872e4e7f6cd29ffea14d641e8.

rackerlabs/qonos,rackerlabs/qonos