Amend/fix return status implementation.