Merge "Better handling of broken storage providers."