Return None instead of empty string