Fix Release Exception Handling + Prepare for Refactor