Log nil trips #7
Merge branch 'fix-nil-method-error'