Added fix to null exception
merged the server correctly this time
updated jar