Adapt null resource to be treated as reference instead of empty string.

Adapt null resource to be treated as reference instead of empty string. #558