ErrorException tweaks