Handle forced termination of composition and fix #29.