re 2922/2846/2908 : mainly eror handling
also tried to add fix for 2930 but theres a problem with minification