Merge "Performs null checks in NanoApp class"