[PATCH aeolus] BZ#676654 Add error handling for record not found exceptions