Bug fixes

Need to look at SessionManager.sendServiceResponse:45 for
nullpointerexception