[refactoring] Reduce the number of potential NPEs Change-Id: I62a933320eb08dfe3df8e4f93d39cbc903dd753d Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>