Adjust for hosting property change
Fix runtime nullpointer exception