Removing hacked-in debug exception