Avoid NPE (testing with Firebug 1.12)
Issue 58: Toggle overlay button doesn't work
Merge branch 'issues', remote-tracking branch 'origin'