APD-112: Improve error handling in controller and service classes
Merge branch 'APD-112' into develop