Cleanup

* Try/except should be used in minimal code block so it doesn't
accidentally catch something we don't want it to catch.
* Removed print statement