more checks, less error messages ;)