Added some diagnostics for #90.