added some more assertions
Merge branch 'develop' of github.com:secure-software-engineering/soot-infoflow-android into develop