Add nil handling in returns from redis

Created by: awsoremod