Fixed error messages to display correct error
Activities now go back to the correct places