Replaced broad exceptions with specific exceptions
Task #CON-18 - Bring down SonarQube technical debt by 10 days
Minor refactorings and removal of technical debt
Task #CON-18 - Bring down SonarQube technical debt by 10 days