patched correct namespace, check if parameters are correct

Change-Id: I1e15d9b4f3304516a84bf321c95bc73ae295f7ff