Hopefully fixed Nullpointer Exception. Animation still stops too early.