Less exceptions, more null, fixes #382