Fix nil processing