a little better patch and a more descriptive message