Handled some errors
Merge pull request #32 from kraftery/bori2

Handled some errors