Added null object, should reduce number of checks