Fixed when structure name and topaz isn't set.
Merge pull request #37 from scottarver/master

Fixed when structure name and topaz isn't set.