errors ! 

+ uuid from external world
+ refactoring

Change-Id: If25f2d1d77184dd149e7df38620e641c0c824f25