code fortification
reverting to old assertion
more code fortification
Merge pull request #129 from raghavgautam/master

code fortification