Some better error handling in composer