Fixed defect ZEN-12930

Uncomment this, or it will be no return value in some cases