Decided that the last comit was actually a bad plan. Now just use a catcher if statement