cppcheck: Throwing the original exception

Change-Id: I0d2678dd86e42f882e8ed9926917f1e82746997e