Remove exception when nothing matches the query criteria. It now returns null