Merge improvements from UK Trains

Improve error handling + Check for new versions + Ask for review