Feature/octopus exception

Improved exception hierarchy.