Minor fixes made to improve fault-tolerance

Created by: marcus-oscarsson

Good evening !,

just some minor fixes made to improve fault-tolerance and beamline inter-operability.

Cheers, Marcus and Matias