Made the data handling more secure, less NPEs