Fixes for Exception and Logging