Added smaller error mapping