HR-235 - hrui - Degrade gracefully on 4.4
Merge pull request #286 from totten/master-44error

HR-235 - hrui - Degrade gracefully on 4.4