added error catch for undefined data
Merge branch 'master' of github.com:inverts/Data-Tamers