UC-1723 - fixed a wrong return statement, and string formatting.