Catch proper exception. Should fix BB-17