NXP-16244: cleanup&format
NXP-16244: fix NPE on RemoteException raised from HttpConnector