minor NPE change, even though NPE can not happen with Basic API.