Last-minute SFP additions to catch some exceptions. Still have more to go, but they can wait, since it'd be from user error.