better timezone validation
Merge remote-tracking branch 'stuartf/issue-726'
Use if statement instead of try/catch