Fb 12 unexpected errors

This resolves #12