Add some null checks
Merge for retab
Retab changes for PR #2158
Merge pull request #13 from tabassassin/retab/pr/2158

Retab/pr/2158
Land #2158 - Fix NoMethodError undefined method `split' for nil:NilClass