Changed how we check for errors in PState and FState

Need to test