Bug 419382: make bean providers more robust