Fixes potential NULL pointer dereference.
Merge pull request #151 from t-nelson/viz_crash_fix

Viz crash fix