Added exception handling.
BUG FIX: Query the correct collection.