Errors in battlestate handled in response to #5