Fixed null returns from calling the class