Use die! macro instead of fail statement