exception type fixes