Closes #531: adds better redirect messages.