Improve descriptor interfaces
Call proper exeption constructor
Issue #14: Fix some sonar issues