Merge pull request #544 from abhin4v/master

Fixes panic while running tree command