changed order of catch