Changed implementation of timestamp()
Removed overly verbose error message