Added rack check, removed try