Removed more complex methods. Unified nil block handling (always throws exception).