Fix #29 - Add specific exceptions
Merge branch 'feature/specific-exception'