Partly revert 04175466 to fix segfault and check for type being empty
Merge pull request #801 from stefanbeller/lastfix

Partly revert 04175466 to fix segfault and check for type being empty