Fixed a bug in composition.

Bug was related to moving the activation code earlier without guarding
against a nulll model.