Add some error handling
Date formatting issue