Remove requirement for existence of records - check for messages instead