[Fix] return empty list or null instead of exception where appropiate