Added missing 'interface' metadata

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Added null check

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>