Improved handling case when admin tried add assembly as part to itself