Merge "Propagate original exception when throwing load exception"