Add a bit more logging in suspicious places (bug 920022)
rename status terms for clarity ( bug 895560)