Fix null assignment