Removed deprecated JError calls and optimized handling (no empty values possible any more)