Fixed null connection