refactored exceptions
Merge remote-tracking branch 'origin/develop' into feature/octopus-exception
Merge pull request #6 from NLeSC/feature/octopus-exception

Feature/octopus exception