minor updates - exceptions and tokens storage