CRM_Core_BAO_Block - Fix API regressions

Undo d195b60 and also add an extra error-check.