Fixed NPE when the server was loaded from favourites file
images
Merge branch 'master' of https://github.com/rrev/SAMPClient.git