Fixed json issues with null responses