fix #17 - verify status first