Skipping empty entries. Tiny bit of additional logging info added.