Fix non-renderer NPE contd