Fix for NPE resulting from connection with no body.