Add error handling on $eval & documentation update