Removed use of deprecated method

 - Use ErrorPageError insteadof using OutputPage
 - Fixed call on non obejct
 - returnto watchlist now

Change-Id: I9dec1558199f1d21c4fbac8fb14a02c38dda983c
Merge "Removed use of deprecated method"