Slightly refactor time constraints and rewrite corresponding error messa...

...ge.