better unexpected-@ handling