Avoid the exception branch in expand

Avoid the exception branch in expand #648