Do more function domain checking