Prevent corrupt workspace state by adding