Bug/error expando

https://www.pivotaltracker.com/s/projects/896548/stories/51139911