Merge "Replace try-catch code by proper type checking. Saves an exception for each blob."