Added error catchall to CMD-WRAPPER