Add some safety checks to PMs