Improve first use and add logging

Correct check for empty properties
Logging says which function is being called.