Handle a null animation effect

Also fix toString() methods