Actually respect panic_on_empty config

Change-Id: I286a93211f645e1ee20af65326f3655ffa72f493
Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I9a0968d671936ce3abed8891f3eba70534fffcf9