Do not catch Throwable but Exception

(cherry picked from commit a5954823353f20a6157156704ae91d6067a1f5c8)