Adding additional error support