Added UnmappedResourceHandler fix as to partial state saving.