small fixes, better exception messages.