Add error catching for first before test