Fix some merge errors for manual search and a bug caused by a missing defensive copy in scene exceptions