Give better error on blank entity id
Merge pull request #3597 from dimagi/better-error

Give better error on blank entity id