properly catch broken calls (better do this than running into a fatal error)
Added tag v2.0.0-alpha2 for changeset 636233cddf80