Removed possibility of assertion

It still doesn't work ideally
Merge branch 'master' of http://github.com/richteer/iiag