Adding better error support.