PFC-2572 #comment groundwork
PFC-2572 #comment hard stop
Fixed NPE