cleaned up some more catch stuff
added pragmas for catch compatibiliy