- fixed possible NPE with certain formations