Added null check.
Added YAP configurations.