#350 - fixes nullref due to build errors in the merged pull request

Signed-off-by: Gordon Burgett <gordon.burgett@gmail.com>
Merge pull request #435 from gburgett/subtree

fixes nullref due to build errors in the merged pull request #350