Adding logic to avoid error on saving status