Not found resources handling

- Not found resources will not be considered as empty string, but as a
null instead.