Added null checks for add/set animation.

closes #173