Adjust skip regex to be a bit less specific
Don't throw raw symfony exceptions