Forward port #924
Change to self
Use JLog rather than JError