Fix both a bug in get* and an error during merge
Merge pull request #4000 from mmascher/insulate-panda

Fix both a bug in get* and an error during merge