Fix retrieveUpcoming and misc. improvements for error handling/throwing. Also update wiki link in readme.