Making exceptions in retrieving non fatal
(cherry picked from commit adb543b)