Add a few date safety checks