Issue 1621: Change error messages for wrong time.

I am traveling, so I am just applying my comments and sending you are separate pull request if that works for you.