Updated with check on custom properties failure