Added more error handling
Merge branch 'Moere_oscilloscope_errors' into develop