[NOJIRA]
Better handling of return status