fixed possible NPE

Change-Id: If81b55672dcce338e4dd3f2ec2c15565f2d43408
Reviewed-on: http://gerrit.esdi-community.eu/3198
Tested-by: Jenkins <sitemple@igd.fraunhofer.de>
Reviewed-by: Simon Templer <simon.templer@igd.fraunhofer.de>
fixed possible NPE for CLI executions

Change-Id: Icbb73af274d6337bb74ad4c02c44cc993d192f45
Reviewed-on: http://gerrit.esdi-community.eu/3199
Tested-by: Jenkins <sitemple@igd.fraunhofer.de>
Reviewed-by: Simon Templer <simon.templer@igd.fraunhofer.de>