Better errors and annotate