Fix null system bug