Slightly refactor time constraints and rewrite corresponding error message.
Merge pull request #125 from banana-slugs-2014/better-record-errors

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