Reverting half-merged commits b6f336c6a13b2a41b2c29b35884277aea9daca50 and 3d4edeb1565e41f692d0c45f064ce3df13e5f211
handling errors with pdf2htmleX and preventing partial Notes from being stored.