Improve block argument check and message