Added overwatch exception handling

Created by: agraubert

@nisckhan13 merge this when you approve it. This is a quick fix, so there's no need to wait for me to merge