Extraction Failed 7 Mo2

Based on the potential failure points, here are the fixes: