applying HBASE-11374 fix 

applying (HBASE-11374)[https://issues.apache.org/jira/browse/HBASE-11374] and adding some logging around the problematic code-path.