Fix crash on expansion errors.
Return error bodies instead of dieing.