Error handling
Attached property fixes