Fixed NPE in MapperModule