handle null
more logging
don't force the overwrite
fix