Issue 4

Addresses problem with NullPropertyException occurring on index runs.