Exceptions and action functions added