Optimize generic object cloning, fix potential NPE

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>