fix catch stuff