some "null object" / "string value" problem fixed