Replace if check with assert in internal function and add further ass…

Replace if check with assert in internal function and add further ass… #65