fixes
Merge pull request #23 from munissor/error-management

fixes