Return on non-fatal condition prematurely

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>