Merge pull request #24 from clicktravel-basharat/master

Log non-interrupt exceptions and re-throw to give feedback
Merge pull request #25 from clicktravel-basharat/master

Fixed bug with persistence framework returning modifiable collections.