#312 - Eliminated use of obscure ternary operation for nil check