Updated error handling and GAPs date format