CDB-1692 Fixed wrong return code on controller