Fixed a major breaking bug

Bug was due to a field checking nil and checking info in the same
statement. These have been appropriately isolated.