fixes null issues in settings