fix exercise time handling
fix error message
Merge pull request #77.