Added missing null pointer check and reference to target interfaces.