Return None if no Application was referenced

Change-Id: Id05cde1941f7a428def8e87761e24d1b9f75c79f
Merge "Return None if no Application was referenced"