oops, fix handling of Java nulls