dodane exception, minor changes