Made exceptions more explicit