Timestamp exception refactoring