Better way to catch all