NPE fix; cosmetics