Added error traps for when current = -1
Added error traps for when current = -1