Handles exceptions better
Adds stocks to test, fixes formatting nit