Tear down bars on destroy() and avoid null pointers.

Change-Id: Ie393689bbf2f0b28895bfde5098c883b5d4ea4a6
2 files changed