Returning an empty list when you click cancel

This solves all the later NPE's

For trello card #172