FW-131. handling the error at a single place