TODO:NPE bug fix for retryStrategy, commenting for now