Make sure if functions return everything went fine Signed-off-by: sherrmann <sophie.herrmann@eodc.eu>