fixed posibble nullpointer exceptions - always return list