Code layout
Move the check for date/time after conversion to UTC

- Fixes bug #57