Handle more bad requests gracefully