SONARIDE-420 Improve error reporting