Fixed 500 issue in delete floder api.
More modified in delete folder and fixed 500 issue.
more changes on folder delete issue
Merge pull request #726 from sarala0927/master

Fixed 500 issue in delete floder api.