Added history functionality for when 404 or other errors occur
Removed else from history functionality
Merge conflict fix
Merge branch 'feature-history-404'