Merge "Fix incorrect exception handling in perfboot.py"