Added more rigid checking on block calls
Added more rigid checking on block calls

gabrielPeart/Tranquil,gabrielPeart/Tranquil,gabrielPeart/Tranquil,fjolnir/Tranquil,fjolnir/Tranquil,gabrielPeart/Tranquil,fjolnir/Tranquil,gabrielPeart/Tranquil,fjolnir/Tranquil,gabrielPeart/Tranquil,fjolnir/Tranquil,fjolnir/Tranquil