added some checks

Signed-off-by: Mickael <mickael@beingenious.com>