Fixed bug where q was swallowing exceptions