*Fixed null-references