Remove possibly buggy animations
Add error message