Further Changes and Potential Fixes

Changes to existing code and try/catch implementation to further help
bug test and implementation.