Fix some exceptions...