Updated to deal with null returns from snippets