Bug 1045076 - Add sanity check to timestamp handlers and return values