Base: Improve error handling for firmware 2.1