Fix empty property error #421