Fixed 500 issue
Merge pull request #748 from saravanab/master

Fixed 500 issue