Fixed nil value error on conditional check
Last commit patched against wrong revision