Minor error handling changes - child shouldn't attach