Added an assert with an extra message

This pull request is only for commit afc606b. Cant figure out how to re-use the same branch, but remove other's commit from my pull requests. :)