Refine error handling. (SOCIALFB-82)