Progress towards #4: Added assertion handler