Merge "Added catching error when calculating elapsedTime."