(2.0) Return compliance check

[MicroNovaX]

I propose to add a check for compliance of the returned value with the signature. Also add a proposal to change the signature, and correct the lines that call this function.