Fixing undefined method index errors
Merge pull request #1694 from daviddavis/index_errors

Fixing undefined index errors