1. -Add a if to avoid crash.
1. -Add HIDE_PROPERTY logic.