Don't error out on custom availability info

 - Also improved comments