Revert "NullPointer & kleine foutjes"

This reverts commit cc76da62098d4b7bf1db8d9e4ff31ea494e1eac2.