Merge "Skip animation in error case, log for further investigation." into nyc-dev