Fixed NPE and colourising