fixed inconsistent return value
added missing dc catch in theme layer