Get handler no longer throws exceptions (null issue). Renamed Server to server (*nix issues with package names)
merge
fix merge conflicts