Cleanup and remove Exception Swallowing

Here is some cleanup for the modules critical to what I will be using.