Removed check for null block. Will re-add later