Prevent getting stuck in a state when there is a missing animation

Fixes #769
Merge pull request #770 from dorkster/animation

Prevent getting stuck in a state when there is a missing animation