Changed suspend/resume_update to not nest

Also added warning if suspend is called when alread suspended, or resume
is called when not suspended.