Changed my organization details and updated fixed a couple more potential NPEs