Handle broken container implementations better