Last-minute SFP additions to catch some exceptions.

Still have some more exceptions that could be thrown, but they can wait, since it'd be from user error. More significant changes to the SFP are in the works now and will be included in v1.1 most likely.