SC-1:fix Null pointer exception
Merge pull request #5 from AnishPavuluri/SC-1

SC-1:fix Null pointer exception
Merge pull request #6 from Seethayya/SC-1

Sc 1