Should fix the null on Battle.java:611.