Bugfix domain check (on null)