Minor Null Fix