Refactored to make error messages not persist

Signed-off-by: Evan Tedesco <evantedesco@gmail.com>