Make sure hessian is not 0 and add counter.
Fixes #1636

(cherry picked from commit d5e25c8f)