small updates

nil checking