Add catch all block