Fixed NPE when using MCPC+