added "pathname" to output
Merge branch 'NullErrorFix'