Improved error log
GDS-1334
GDS-1334