Assing message cleanup, fixes #6514
Display No Date Found when there is an error, fixes 6490