Add a global recover to MakeMainHandler