Merge pull request #91 from dfcoffin/master

Add logic to handle IndexOutOfBound and NullDataset Exceptions