Merge pull request #172 from amitjoy/fix/npe/scr