Merge change 4115 into donut

* changes:
  * component can be null after destory?  This was causing NPE in catch block, which hides the actual exception.