Minor fixes

fixes separated from #22

the change in the exception can be discussed: Only changing this exception but not changing all the others which use the same style...