Added some error checking to wishlist.js
Merge remote-tracking branch 'origin/master'