Improve parsing to datetime and add error handling

Improve parsing to datetime and add error handling #1571