Hendrik Leppkes:
	- Add some sanity checks in various places.
