Bug Fixes - Still need to examine format of date passed back if other fields are invalid