REST-10: Fix a findbugs issue with the code.