pre-exception fix