clean up some over-aggressive catches
bump to M4