Proper handle empty properties