More gracefully handle bad actions.

Conflicts:

	includes/calendar.php