Will `autofs` or similar prevent Caja from freezing when Samba shares are unmounted?

Caja will freeze/crash if a Samba share is disconnected before unmounting the share. Does anyone know if autofs will help, or of any alternative solutions?

The problem is:

  1. Mount Samba share by clicking the corresponding item in Caja’s sidebar.
  2. Disconnect from the Samba share without unmounting. (This is most often caused by undocking my laptop).
  3. Caja becomes unresponsive, freezes, and must be pkilled.

Any suggestions/solutions?