Fixed code problem

- DATA_KEY_NAME not defined
- missing return statement