Branch/avoid zero length animations

@rchadwic would you mind testing and reviewing?